/hg/icedtea7: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 9e0c07300664 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=9e0c07300664
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jan 15 09:40:18 2013 +0000

	When building with PaX, PaX mark the output directory before running the just-built rmic.

	2013-01-15  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* Makefile.am:
		(ICEDTEA_PATCHES): Add patch when building
		with PaX.
		* patches/pax-mark-rmic-java.patch:
		PaX mark output directory before running just-built
		rmic.


changeset 981d010a05bf in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=981d010a05bf
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Sep 20 18:01:32 2013 +0100

	PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4

	2013-05-28  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4
		* Makefile.am:
		(STAGE1_BOOT_RUNTIME): New variable to store path
		to stage 1 rt.jar.
		(STAGE2_BOOT_RUNTIME): Likewise for stage 2.
		(bootstrap-directory-stage1): Use STAGE1_BOOT_RUNTIME.
		(rt): Only update STAGE1_BOOT_RUNTIME if it exists.
		(clean-rt): Mirror creation of STAGE1_BOOT_RUNTIME in
		bootstrap-directory-stage1.


diffstat:

 ChangeLog                        |  21 +++++++++++++++++++++
 Makefile.am                      |  21 +++++++++++++--------
 patches/pax-mark-rmic-java.patch |  10 ++++++++++
 3 files changed, 44 insertions(+), 8 deletions(-)

diffs (105 lines):

diff -r 0c77e9a81a9b -r 981d010a05bf ChangeLog
--- a/ChangeLog	Fri Sep 20 14:26:50 2013 +0100
+++ b/ChangeLog	Fri Sep 20 18:01:32 2013 +0100
@@ -1,3 +1,24 @@
+2013-05-28  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR1410: Icedtea 2.3.9 fails to build using icedtea 1.12.4
+	* Makefile.am:
+	(STAGE1_BOOT_RUNTIME): New variable to store path
+	to stage 1 rt.jar.
+	(STAGE2_BOOT_RUNTIME): Likewise for stage 2.
+	(bootstrap-directory-stage1): Use STAGE1_BOOT_RUNTIME.
+	(rt): Only update STAGE1_BOOT_RUNTIME if it exists.
+	(clean-rt): Mirror creation of STAGE1_BOOT_RUNTIME in
+	bootstrap-directory-stage1.
+
+2013-01-15  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add patch when building
+	with PaX.
+	* patches/pax-mark-rmic-java.patch:
+	PaX mark output directory before running just-built
+	rmic.
+
 2013-06-28  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* acinclude.m4:
diff -r 0c77e9a81a9b -r 981d010a05bf Makefile.am
--- a/Makefile.am	Fri Sep 20 14:26:50 2013 +0100
+++ b/Makefile.am	Fri Sep 20 18:01:32 2013 +0100
@@ -67,6 +67,8 @@
 STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
 JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
 CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build
+STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar
+STAGE2_BOOT_RUNTIME = $(STAGE2_BOOT_DIR)/jre/lib/rt.jar
 
 # Source directories
 
@@ -296,7 +298,9 @@
 endif
 
 if WITH_PAX
-ICEDTEA_PATCHES += patches/test_gamma.patch
+ICEDTEA_PATCHES += \
+	patches/test_gamma.patch \
+	patches/pax-mark-rmic-java.patch
 endif
 
 ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
@@ -1644,14 +1648,13 @@
 	ln -sf ../../../javap $(STAGE1_BOOT_DIR)/bin/javap
 	mkdir -p $(STAGE1_BOOT_DIR)/lib/modules
 	mkdir -p $(STAGE1_BOOT_DIR)/jre/lib && \
-	cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
-	  $(STAGE1_BOOT_DIR)/jre/lib/rt.jar && \
-	chmod u+w $(STAGE1_BOOT_DIR)/jre/lib/rt.jar
+	cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_RUNTIME) && \
+	chmod u+w $(STAGE1_BOOT_RUNTIME)
 	mkdir -p $(STAGE1_BOOT_DIR)/lib && \
 	if [ -e $(SYSTEM_JDK_DIR)/lib/tools.jar ] ; then \
 	  ln -sf $(SYSTEM_JDK_DIR)/lib/tools.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
 	else \
-	  ln -sf $(STAGE1_BOOT_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
+	  ln -sf $(STAGE1_BOOT_RUNTIME) $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
 	fi
 	ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	  $(STAGE1_BOOT_DIR)/jre/lib/ && \
@@ -2675,8 +2678,9 @@
 	     mkdir -p `dirname $$destpath` ; \
 	     cp -a ../../$$dirs $$destpath ; \
 	   done ; \
-	   $(ZIP) -qur $(STAGE1_BOOT_DIR)/jre/lib/rt.jar \
-	     com java javax sun ); \
+	   if [ -w $(STAGE1_BOOT_RUNTIME) ] ; then \
+	     $(ZIP) -qur $(STAGE1_BOOT_RUNTIME) com java javax sun ; \
+	   fi ; ) \
 	fi
 	mkdir -p stamps
 	touch $@
@@ -2686,7 +2690,8 @@
 	rm -f stamps/rt-class-files.stamp stamps/rt.stamp
 	rm -f rt-source-files.txt
 	if [ -e $(STAGE1_BOOT_DIR)/jre/lib ] ; then \
-	  cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/jre/lib ; \
+	  cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_RUNTIME) ; \
+	  chmod u+w $(STAGE1_BOOT_RUNTIME) ; \
 	fi
 
 # Crypto Level Check
diff -r 0c77e9a81a9b -r 981d010a05bf patches/pax-mark-rmic-java.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pax-mark-rmic-java.patch	Fri Sep 20 18:01:32 2013 +0100
@@ -0,0 +1,10 @@
+--- openjdk/jdk/make/com/sun/jmx/Makefile
++++ openjdk/jdk/make/com/sun/jmx/Makefile
+@@ -119,6 +119,7 @@
+ 
+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
+ 	$(prep-target)
++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
+                 -d $(CLASSDESTDIR)              \
+                 -v1.2                           \