From: Stefan Jones Date: Wed, 3 Nov 2004 19:07:58 +0000 (+0000) Subject: Added patch for gcc-3.4 compile X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=412555143549e25187cbe1f5f3d3b469376ae23c;p=gentoo.git Added patch for gcc-3.4 compile --- 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 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 sun-j2sdk-1.4.1-r1.ebuild, sun-j2sdk-1.4.2.ebuild: diff --git a/dev-java/sun-j2sdk/Manifest b/dev-java/sun-j2sdk/Manifest index 6be6dcfa413d..01ed806ae473 100644 --- a/dev-java/sun-j2sdk/Manifest +++ b/dev-java/sun-j2sdk/Manifest @@ -1,8 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 a65f054d7d05db66da2fb78bd0cd59a9 sun-j2sdk-1.4.2.ebuild 3841 -MD5 94b9c6412867a1f27995e247e14ee04d ChangeLog 4676 +MD5 c06e2a9da33afc0c4cede26fd96ac628 sun-j2sdk-1.4.2.ebuild 3857 +MD5 b713a26f4a6f3579d549a17a011a91e4 ChangeLog 4844 MD5 f4eeb1e3cd292967d0a36065d8bc1e3e sun-j2sdk-1.4.1-r1.ebuild 3990 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 3151dccccac816a78850fca950201f6f files/sun-j2sdk-1.4.1 447 @@ -22,11 +19,5 @@ MD5 ea3048b7ef26c763bb331b1430061d4c files/1.4.2/j2sdk-1.4.2-static_cxx.patch 43 MD5 0bb65304895dd012bebfc692fbd48af1 files/1.4.2/j2sdk-1.4.2-pthread.patch 1624 MD5 276f4ce091acd44428e36c15de66f7d1 files/1.4.2/j2sdk-1.4.2-gcc3.3-fixes.patch 4176 MD5 df6db4b858ad836d290f1862857622d9 files/1.4.2/j2sdk-1.4.2-remove-fixed-paths.patch 4525 +MD5 db4df45b4212ae4c82f6ac2fcf75057f files/1.4.2/j2sdk-1.4.2-gcc3.4-fixes.patch 1958 MD5 7c7b6039ae92a59953775ddb8d8b93c8 files/1.4.2/j2sdk-1.4.2-force-motif.patch 3137 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBWyLV/rLF9B432nYRAmOWAKCYd4wMpBz1PWQkVFIrYJGoLQzV6QCfSVk/ -AJklHN33xFMcy1kmyrhQZs8= -=Cnrt ------END PGP SIGNATURE----- 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