Fix building with gcc-4.5 and USE=systemtap - fixes bug #317343. Bump the 6.1.7.2-r1 to 6.7.1.3 (which is the same)for easier sync with the overlay.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 165 insertions, 8 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 8f390f546eef..77f137077f58 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.6 2010/04/15 13:47:56 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.7 2010/05/03 12:32:51 caster Exp $
+
+*icedtea-6.1.7.3 (03 May 2010)
+
+  03 May 2010; Vlastimil Babka <caster@gentoo.org>
+  +files/6.1.7.3-systemtap-gcc-4.5.patch,
+  +files/6.1.8.0-systemtap-gcc-4.5.patch, -icedtea-6.1.7.1.ebuild,
+  +icedtea-6.1.7.3.ebuild, icedtea-6.1.8.0.ebuild:
+  Fix building with gcc-4.5 and USE=systemtap - fixes bug #317343. Bump the
+  6.1.7.2-r1 to 6.7.1.3 (which is the same)for easier sync with the overlay.
 
   15 Apr 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.8.0.ebuild:
   Add ant-nodeps to DEPEND since it's used in ANT_TASKS variable. Bug
diff --git a/dev-java/icedtea/files/6.1.7.3-systemtap-gcc-4.5.patch b/dev-java/icedtea/files/6.1.7.3-systemtap-gcc-4.5.patch
new file mode 100644
index 000000000000..e5004f032e31
--- /dev/null
+++ b/dev-java/icedtea/files/6.1.7.3-systemtap-gcc-4.5.patch
@@ -0,0 +1,62 @@
+# HG changeset patch
+# User Andrew John Hughes <ahughes@redhat.com>
+# Date 1272471515 -3600
+# Node ID c8d38c28900e01a04d730fc59f899ae0cd1d0779
+# Parent  c30ad39537453fa171d094f3534e79a2faf16fad
+PR476: Enable building SystemTap on GCC 4.5.
+
+2010-04-28  Andrew John Hughes  <ahughes@redhat.com>
+
+	PR icedtea/476
+	* Makefile.am:
+	Add patch when SystemTap is enabled to support
+	building with GCC 4.5.
+	* patches/systemtap-gcc-4.5.patch:
+	Add cast to NULL (doesn't apply to DTrace due
+	to differences between SystemTap and DTrace macros).
+
+diff -r c30ad3953745 -r c8d38c28900e ChangeLog
+--- a/ChangeLog	Mon Apr 26 14:11:34 2010 +0200
++++ b/ChangeLog	Wed Apr 28 17:18:35 2010 +0100
+@@ -1,3 +1,13 @@
++2010-04-28  Andrew John Hughes  <ahughes@redhat.com>
++
++	PR icedtea/476
++	* Makefile.am:
++	Add patch when SystemTap is enabled to support
++	building with GCC 4.5.
++	* patches/systemtap-gcc-4.5.patch:
++	Add cast to NULL (doesn't apply to DTrace due
++	to differences between SystemTap and DTrace macros).
++
+ 2010-03-31  Andrew John Hughes  <ahughes@redhat.com>
+ 
+ 	* Makefile.am: Add Ant patch.
+diff -r c30ad3953745 -r c8d38c28900e Makefile.am
+--- a/Makefile.am	Mon Apr 26 14:11:34 2010 +0200
++++ b/Makefile.am	Wed Apr 28 17:18:35 2010 +0100
+@@ -374,7 +374,8 @@
+ endif
+ 
+ if ENABLE_SYSTEMTAP
+-ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
++ICEDTEA_PATCHES += patches/icedtea-systemtap.patch \
++	patches/systemtap-gcc-4.5.patch
+ endif
+ 
+ if ENABLE_NSS
+diff -r c30ad3953745 -r c8d38c28900e patches/systemtap-gcc-4.5.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/systemtap-gcc-4.5.patch	Wed Apr 28 17:18:35 2010 +0100
+@@ -0,0 +1,11 @@
++--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp	2010-04-28 08:51:29.000000000 +0100
+++++ openjdk/hotspot/src/share/vm/prims/jni.cpp	2010-04-28 09:29:22.000000000 +0100
++@@ -2723,7 +2723,7 @@
++ 
++   if (!directBufferSupportInitializeEnded) {
++     if (!initializeDirectBufferSupport(env, thread)) {
++-      DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL);
+++      DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, (uintptr_t) NULL);
++       return NULL;
++     }
++   }
diff --git a/dev-java/icedtea/files/6.1.8.0-systemtap-gcc-4.5.patch b/dev-java/icedtea/files/6.1.8.0-systemtap-gcc-4.5.patch
new file mode 100644
index 000000000000..95ef9a245d96
--- /dev/null
+++ b/dev-java/icedtea/files/6.1.8.0-systemtap-gcc-4.5.patch
@@ -0,0 +1,62 @@
+# HG changeset patch
+# User Andrew John Hughes <ahughes@redhat.com>
+# Date 1272471515 -3600
+# Node ID c8d38c28900e01a04d730fc59f899ae0cd1d0779
+# Parent  c30ad39537453fa171d094f3534e79a2faf16fad
+PR476: Enable building SystemTap on GCC 4.5.
+
+2010-04-28  Andrew John Hughes  <ahughes@redhat.com>
+
+	PR icedtea/476
+	* Makefile.am:
+	Add patch when SystemTap is enabled to support
+	building with GCC 4.5.
+	* patches/systemtap-gcc-4.5.patch:
+	Add cast to NULL (doesn't apply to DTrace due
+	to differences between SystemTap and DTrace macros).
+
+diff -r c30ad3953745 -r c8d38c28900e ChangeLog
+--- a/ChangeLog	Mon Apr 26 14:11:34 2010 +0200
++++ b/ChangeLog	Wed Apr 28 17:18:35 2010 +0100
+@@ -1,3 +1,13 @@
++2010-04-28  Andrew John Hughes  <ahughes@redhat.com>
++
++	PR icedtea/476
++	* Makefile.am:
++	Add patch when SystemTap is enabled to support
++	building with GCC 4.5.
++	* patches/systemtap-gcc-4.5.patch:
++	Add cast to NULL (doesn't apply to DTrace due
++	to differences between SystemTap and DTrace macros).
++
+ 2010-04-12  Andrew John Hughes  <ahughes@redhat.com>
+ 
+ 	PR icedtea/373
+diff -r c30ad3953745 -r c8d38c28900e Makefile.am
+--- a/Makefile.am	Mon Apr 26 14:11:34 2010 +0200
++++ b/Makefile.am	Wed Apr 28 17:18:35 2010 +0100
+@@ -374,7 +374,8 @@
+ endif
+ 
+ if ENABLE_SYSTEMTAP
+-ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
++ICEDTEA_PATCHES += patches/icedtea-systemtap.patch \
++	patches/systemtap-gcc-4.5.patch
+ endif
+ 
+ if ENABLE_NSS
+diff -r c30ad3953745 -r c8d38c28900e patches/systemtap-gcc-4.5.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/systemtap-gcc-4.5.patch	Wed Apr 28 17:18:35 2010 +0100
+@@ -0,0 +1,11 @@
++--- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp	2010-04-28 08:51:29.000000000 +0100
+++++ openjdk/hotspot/src/share/vm/prims/jni.cpp	2010-04-28 09:29:22.000000000 +0100
++@@ -2723,7 +2723,7 @@
++ 
++   if (!directBufferSupportInitializeEnded) {
++     if (!initializeDirectBufferSupport(env, thread)) {
++-      DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL);
+++      DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, (uintptr_t) NULL);
++       return NULL;
++     }
++   }
diff --git a/dev-java/icedtea/icedtea-6.1.7.1.ebuild b/dev-java/icedtea/icedtea-6.1.7.3.ebuild
index 3365af2c89b0..d27c275105b5 100644
--- a/dev-java/icedtea/icedtea-6.1.7.1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.7.1.ebuild,v 1.1 2010/03/04 23:20:59 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.7.3.ebuild,v 1.1 2010/05/03 12:32:51 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -9,14 +9,14 @@
 
 EAPI="2"
 
-inherit pax-utils java-pkg-2 java-vm-2
+inherit autotools pax-utils java-pkg-2 java-vm-2
 
 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
 SLOT="6"
 KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and dependencies"
-ICEDTEA_VER="1.7.1"
+ICEDTEA_VER="1.7.3"
 ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER}
 OPENJDK_BUILD="17"
 OPENJDK_DATE="14_oct_2009"
@@ -75,10 +75,11 @@ RDEPEND=">=net-print/cups-1.2.12
 #   xext headers have two variants depending on version - bug #288855
 DEPEND="${RDEPEND}
 	|| (
+		( >=dev-java/gcj-jdk-4.3 =app-admin/eselect-ecj-0.5-r1 )
+		( >=dev-java/cacao-0.99.2 =app-admin/eselect-ecj-0.5-r1 )
 		dev-java/icedtea6-bin
 		dev-java/icedtea:${SLOT}
 	)
-	>=virtual/jdk-1.5
 	app-arch/zip
 	>=dev-java/xalan-2.7.0:0
 	>=dev-java/xerces-2.9.1:2
@@ -96,6 +97,11 @@ DEPEND="${RDEPEND}
 	)
 	sys-apps/lsb-release"
 
+# a bit of hack so the VM switching is triggered without causing dependency troubles
+JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.5"
+JAVA_PKG_WANT_SOURCE="1.5"
+JAVA_PKG_WANT_TARGET="1.5"
+
 pkg_setup() {
 # Shark support disabled for now - still experimental and needs sys-devel/llvm
 #	if use shark ; then
@@ -153,6 +159,15 @@ src_unpack() {
 	unpack ${ICEDTEA_PKG}.tar.gz
 }
 
+src_prepare() {
+	# Fix build with SystemTap + gcc 4.5
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=476
+	if use systemtap; then
+		epatch "${FILESDIR}/${PV}-systemtap-gcc-4.5.patch"
+		eautoreconf || die "eautoreconf failed"
+	fi
+}
+
 unset_vars() {
 	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
 }
@@ -168,7 +183,7 @@ src_configure() {
 		config="${config} --with-openjdk=$(java-config -O)"
 	elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
 		# For other 1.5 JDKs e.g. GCJ, CACAO.
-		config="${config} --with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj:3.3 ecj.jar)" \
+		config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \
 		config="${config} --with-gcj-home=${vmhome}"
 	else
 		eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
diff --git a/dev-java/icedtea/icedtea-6.1.8.0.ebuild b/dev-java/icedtea/icedtea-6.1.8.0.ebuild
index d42138864a4d..2555f0b1b32a 100644
--- a/dev-java/icedtea/icedtea-6.1.8.0.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.8.0.ebuild,v 1.2 2010/04/15 13:47:56 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.8.0.ebuild,v 1.3 2010/05/03 12:32:51 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -9,7 +9,7 @@
 
 EAPI="2"
 
-inherit pax-utils java-pkg-2 java-vm-2
+inherit autotools pax-utils java-pkg-2 java-vm-2
 
 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
 SLOT="6"
@@ -161,6 +161,15 @@ src_unpack() {
 	unpack ${ICEDTEA_PKG}.tar.gz
 }
 
+src_prepare() {
+	# Fix build with SystemTap + gcc 4.5
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=476
+	if use systemtap; then
+		epatch "${FILESDIR}/${PV}-systemtap-gcc-4.5.patch"
+		eautoreconf || die "eautoreconf failed"
+	fi
+}
+
 unset_vars() {
 	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
 }