/hg/icedtea6: PR689: Shark fails to find LLVM 2.9 System headers...

[Dr Andrew John Hughes]

On 15:12 Mon 30 May     , Omair Majid wrote:
> On 05/30/2011 03:04 PM, Dr Andrew John Hughes wrote:
> > On 14:17 Tue 12 Apr     , xranby at icedtea.classpath.org wrote:
> >> changeset 307d19e0cca0 in /hg/icedtea6
> >> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=307d19e0cca0
> >> author: Xerxes R?nby<xerxes at zafena.se>
> >> date: Tue Apr 12 15:56:56 2011 +0200
> >>
> >> 	PR689: Shark fails to find LLVM 2.9 System headers during build
> >>
> >> 	2011-04-12 Xerxes R?nby<xerxes at zafena.se>
> >>
> >> 	PR689: Shark fails to find LLVM 2.9 System headers during
> >> 	build
> >> 		* Makefile.am: Add patch.
> >> 		* patches/shark-llvm-2.9.patch: In LLVM 2.9 System headers are
> >> 	moved to Support.
> >> 		* NEWS: Updated.
> >>
> >>
> >> diffstat:
> >>
> >>   ChangeLog                    |   8 ++++++++
> >>   Makefile.am                  |   3 ++-
> >>   NEWS                         |   2 ++
> >>   patches/shark-llvm-2.9.patch |  28 ++++++++++++++++++++++++++++
> >>   4 files changed, 40 insertions(+), 1 deletions(-)
> >>
> >
> > I just had to move this to the hs20 section as it wouldn't apply with hs19
> > and caused a build failure:
> > http://mail.openjdk.java.net/pipermail/icedtea-test/2011-May/000369.html
> >
> > Did you test this with both HotSpot builds?  Will the release branches
> > be affected in the same way?
> 
> Erm. I think this might have been my mistake. I replaced Xerxes's patch 
> with the hg export of an upstream changeset (only on HEAD though). The 
> only difference between the patch and the hg export was a copyright 
> change in the year. That might have broken this. Sorry.
> 

You're right in that 1.10 seems fine.  I couldn't get the version on HEAD
to apply to hs19 at all though (it was more than just a dumb copyright
line).  Maybe best to revert your change?

> Omair

-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37