diff options
| author |   Stefan Jones <cretin@gentoo.org> | 2004-11-03 19:07:58 +0000 |
|---|---|---|
| committer | Stefan Jones <cretin@gentoo.org> | 2004-11-03 19:07:58 +0000 |
| commit | f1ab8fe98ef2f16cb90855bb7148fc3b4094c8d4 (patch) | |
| tree | aa52bf1ec8465039e2e7b2b7a7adb906e3c5f279 /dev-java | |
| parent | fixed bug #69951 (Manifest recommit) (diff) | |
| download | gentoo-2-f1ab8fe98ef2f16cb90855bb7148fc3b4094c8d4.tar.gz gentoo-2-f1ab8fe98ef2f16cb90855bb7148fc3b4094c8d4.tar.bz2 gentoo-2-f1ab8fe98ef2f16cb90855bb7148fc3b4094c8d4.zip | |
Added patch for gcc-3.4 compile
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/sun-j2sdk/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-gcc3.4-fixes.patch | 43 | ||||
| -rw-r--r-- | dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild | 5 |
3 files changed, 51 insertions, 3 deletions
diff --git a/dev-java/sun-j2sdk/ChangeLog b/dev-java/sun-j2sdk/ChangeLog index 7e69dfc624a9..ffd849d74c9f 100644 --- a/dev-java/sun-j2sdk/ChangeLog +++ b/dev-java/sun-j2sdk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/sun-j2sdk # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.32 2004/09/29 21:01:53 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.33 2004/11/03 19:07:58 cretin Exp $ + + 03 Nov 2004; Stefan Jones <cretin@gentoo.org> sun-j2sdk-1.4.2.ebuild, + +files/1.4.2/j2sdk-1.4.2-gcc3.4-fixes.patch: + Added patch so gcc 3.4 compiles, bug #51289 29 Sep 2004; Thomas Matthijs <axxo@gentoo.org> sun-j2sdk-1.4.1-r1.ebuild, sun-j2sdk-1.4.2.ebuild: diff --git a/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-gcc3.4-fixes.patch b/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-gcc3.4-fixes.patch new file mode 100644 index 000000000000..fbe9bfd9dd6f --- /dev/null +++ b/dev-java/sun-j2sdk/files/1.4.2/j2sdk-1.4.2-gcc3.4-fixes.patch @@ -0,0 +1,43 @@ +--- j2sdk/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp.jj 2004-09-15 09:13:45.000000000 -0700 ++++ j2sdk/hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp 2004-09-16 10:55:57.650095032 -0700 +@@ -50,7 +50,7 @@ + __asm__ volatile ( "pushl %%ebx;mov 4+%1,%%ecx;mov %1,%%ebx;lock;cmpxchg8b (%3);popl %%ebx" + : "=A" (old_value) + : "m" (exchange_value), "A" (compare_value), "r" (dest) +- : "%ebx", "%ecx", "memory"); ++ : "%ecx", "memory"); + return old_value; + } + +--- j2sdk/j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp.jj 2004-11-02 13:59:12.267814176 -0800 ++++ j2sdk/j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp 2004-11-02 14:05:10.354376744 -0800 +@@ -933,14 +933,14 @@ + CMAPMapper::CharsToGlyphs( + int count, const Unicode16 unicodes[], UInt32 glyphs[]) const + { +- ConvertUnicodeToGlyphs(*font, (unsigned char *)cmap, count, unicodes, glyphs); ++ ConvertUnicodeToGlyphs(*font, (unsigned char *&)cmap, count, unicodes, glyphs); + } + + void + CMAPMapper::CharsToGlyphs( + int count, const Unicode32 unicodes[], UInt32 glyphs[]) const + { +- ConvertUnicodeToGlyphs(*font, (unsigned char *)cmap, count, unicodes, glyphs); ++ ConvertUnicodeToGlyphs(*font, (unsigned char *&)cmap, count, unicodes, glyphs); + } + + ////////////////////////////////////////////////////////////////////////////// +--- j2sdk/mozilla/share/plugin/mozilla_headers_ns610/nscore.h.jj 2004-11-02 14:22:23.209358920 -0800 ++++ j2sdk/mozilla/share/plugin/mozilla_headers_ns610/nscore.h 2004-11-02 14:27:26.490253216 -0800 +@@ -192,6 +192,10 @@ + #define HAVE_CPP_2BYTE_WCHAR_T + #endif + ++#if defined(__GNUC__) ++#define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX ++#endif ++ + /* until we get an autoconf test for this, we'll assume it's on (since we're using it already) */ + #define HAVE_CPP_TYPENAME + diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild index d173d05ad208..119a99b39a37 100644 --- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild +++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild,v 1.13 2004/09/29 21:01:53 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild,v 1.14 2004/11/03 19:07:58 cretin Exp $ inherit java @@ -8,7 +8,8 @@ JAVA_PATCHES=" remove-fixed-paths static_cxx force-motif - gcc3.3-fixes" + gcc3.3-fixes + gcc3.4-fixes" S=${WORKDIR}/j2sdk |