Mercurial > hg > icedtea7

changeset 2545:2917541bbda4 icedtea-2.2-branchpoint

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix full bootstrapping build of IcedTea7 with itself. 2012-05-23 Andrew John Hughes <ahughes@redhat.com> * patches/boot/corba-defs.patch: Removed. Makes changes which aren't needed and break the build with IcedTea7. * Makefile.am: (ICEDTEA_BOOT_PATCHES): Drop corba-defs.patch. * patches/boot/corba-dependencies.patch: Reduce to just the necessary change of adding jdk tree dependencies to the CORBA build. Add solaris too so the build with IcedTea7 works (needs DefaultInterface). * patches/boot/jaxws-jdk-dependency.patch: Add solaris dependency (DefaultInterface). * patches/boot/xbootclasspath.patch: Don't set JAVACFLAGS to point to non-existent rt.jar in {JDK_HOME}/lib. Point to just-built langtools instead. 2011-03-02 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: (icedtea): Explicitly set -j1 for the legacy OpenJDK build as it can't handle parallelism correctly. This allows the main IcedTea build to be parallel while still allowing OpenJDK to build. (icedtea-debug): Likewise. (icedtea-ecj): Likewise.
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 23 May 2012 15:32:36 +0100
parents a1aed32a081d
children 0198d2de05dd
files ChangeLog Makefile.am patches/boot/corba-defs.patch patches/boot/corba-dependencies.patch patches/boot/jaxws-jdk-dependency.patch patches/boot/xbootclasspath.patch
diffstat 6 files changed, 41 insertions(+), 73 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon May 21 19:18:12 2012 +0100
+++ b/ChangeLog	Wed May 23 15:32:36 2012 +0100
@@ -1,3 +1,32 @@
+2012-05-23  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/boot/corba-defs.patch:
+	Removed.  Makes changes which aren't needed
+	and break the build with IcedTea7.
+	* Makefile.am:
+	(ICEDTEA_BOOT_PATCHES): Drop corba-defs.patch.
+	* patches/boot/corba-dependencies.patch:
+	Reduce to just the necessary change of adding jdk
+	tree dependencies to the CORBA build.  Add solaris
+	too so the build with IcedTea7 works (needs
+	DefaultInterface).
+	* patches/boot/jaxws-jdk-dependency.patch:
+	Add solaris dependency (DefaultInterface).
+	* patches/boot/xbootclasspath.patch:
+	Don't set JAVACFLAGS to point to non-existent rt.jar
+	in {JDK_HOME}/lib.  Point to just-built langtools instead.
+
+2011-03-02  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(icedtea): Explicitly set -j1 for the
+	legacy OpenJDK build as it can't handle
+	parallelism correctly.  This allows the
+	main IcedTea build to be parallel while
+	still allowing OpenJDK to build.
+	(icedtea-debug): Likewise.
+	(icedtea-ecj): Likewise.
+
 2012-05-21  Andrew John Hughes  <ahughes@redhat.com>
 
 	(JDK_CHANGESET): Bump to bring in the
--- a/Makefile.am	Mon May 21 19:18:12 2012 +0100
+++ b/Makefile.am	Wed May 23 15:32:36 2012 +0100
@@ -287,7 +287,6 @@
 ICEDTEA_BOOT_PATCHES = \
 	patches/boot/javafiles.patch \
 	patches/boot/ant-javac.patch \
-	patches/boot/corba-defs.patch \
 	patches/boot/corba-idlj.patch \
 	patches/boot/corba-no-gen.patch \
 	patches/boot/corba-orb.patch \
@@ -1646,7 +1645,7 @@
  stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
  stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp \
  stamps/jamvm.stamp
-	$(ARCH_PREFIX) $(MAKE) \
+	$(ARCH_PREFIX) $(MAKE) -j1 \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
 	  $(ICEDTEA_BUILD_TARGET)
@@ -1712,7 +1711,7 @@
  stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
  stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp \
  stamps/jamvm.stamp
-	$(ARCH_PREFIX) $(MAKE) \
+	$(ARCH_PREFIX) $(MAKE) -j1 \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
 	  $(ICEDTEA_DEBUG_BUILD_TARGET)
@@ -1801,7 +1800,7 @@
 stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
  stamps/download.stamp $(OPENJDK_BOOT_TREE) stamps/cacao.stamp \
  stamps/rewrite-rhino.stamp stamps/jamvm.stamp stamps/generated.stamp
-	$(ARCH_PREFIX) $(MAKE) \
+	$(ARCH_PREFIX) $(MAKE) -j1 \
 	  $(ICEDTEA_ENV_BOOT) \
 	  -C openjdk-boot \
 	  $(ICEDTEA_BUILD_TARGET)
--- a/patches/boot/corba-defs.patch	Mon May 21 19:18:12 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-diff -Nru openjdk-boot.orig/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
---- openjdk-boot.orig/corba/make/common/Defs.gmk	2012-02-15 17:08:19.000000000 +0000
-+++ openjdk-boot/corba/make/common/Defs.gmk	2012-03-18 22:37:54.536815001 +0000
-@@ -75,6 +75,13 @@
-   endif
- endif
- 
-+
-+ifdef ALT_LANGTOOLS_DIST
-+  LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST))
-+else
-+  LANGTOOLS_DIST =
-+endif 
-+
- #
- # Get platform definitions
- #
-@@ -107,8 +114,6 @@
- # for build tool jar files
- BUILDTOOLJARDIR     = $(OUTPUTDIR)/btjars
- ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
--# for generated java source files
--GENSRCDIR           = $(OUTPUTDIR)/gensrc
- # for imported source files
- IMPORTSRCDIR        = $(OUTPUTDIR)/impsrc
- # for imported documents
-@@ -189,7 +194,7 @@
- # We define an intermediate variable for Java files because
- # we use its value later to help define $SOURCEPATH
- 
--VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
-+VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
- VPATH.java = $(VPATH0.java)
- vpath %.java $(VPATH.java)
- vpath %.class $(CLASSBINDIR)
--- a/patches/boot/corba-dependencies.patch	Mon May 21 19:18:12 2012 +0100
+++ b/patches/boot/corba-dependencies.patch	Wed May 23 15:32:36 2012 +0100
@@ -1,39 +1,14 @@
-diff -Nru openjdk-boot.orig/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
---- openjdk-boot.orig/corba/make/common/Defs.gmk	2011-03-08 18:49:48.566665532 +0000
-+++ openjdk-boot/corba/make/common/Defs.gmk	2011-03-08 18:47:51.734115218 +0000
-@@ -50,6 +50,9 @@
- ifndef SHARE_SRC
-   SHARE_SRC    = $(TOPDIR)/src/share
- endif
-+ifndef JDK_SRC
-+  JDK_SRC = $(JDK_TOPDIR)/src/share
-+endif
- 
- _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
- 
-@@ -172,7 +175,7 @@
- # We define an intermediate variable for Java files because
- # we use its value later to help define $SOURCEPATH
- 
--VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
-+VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes$(CLASSPATH_SEPARATOR)$(JDK_SRC)/classes
- VPATH.java = $(VPATH0.java)
- vpath %.java $(VPATH.java)
- vpath %.class $(CLASSBINDIR)
-diff -Nru openjdk-boot.orig/corba/make/common/Rules.gmk openjdk-boot/corba/make/common/Rules.gmk
---- openjdk-boot.orig/corba/make/common/Rules.gmk	2011-03-08 18:48:19.953282134 +0000
-+++ openjdk-boot/corba/make/common/Rules.gmk	2011-03-08 18:48:05.453710200 +0000
-@@ -184,7 +184,12 @@
+diff --git a/make/common/Rules.gmk b/make/common/Rules.gmk
+--- openjdk-boot/corba/make/common/Rules.gmk
++++ openjdk-boot/corba/make/common/Rules.gmk
+@@ -184,7 +184,9 @@
  	@$(MKDIR) -p $(CLASSDESTDIR)
  	if [ -s $(JAVA_SOURCE_LIST) ] ; then \
  	  $(CAT) $(JAVA_SOURCE_LIST); \
 -	  $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ 	  $(ECHO) $(JAVAC_CMD) -classpath $(ABS_OUTPUTDIR)/corba/classes \
-+	  	 -classpath $(LANGTOOLS_DIST)/lib/classes.jar \
-+ 		 -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ 	  $(JAVAC_CMD) -classpath $(ABS_OUTPUTDIR)/corba/classes \
-+	  	 -classpath $(LANGTOOLS_DIST)/lib/classes.jar \
-+ 		 -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
++	  $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) \
++	    -sourcepath "$(SOURCEPATH):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes" \
++	    -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
  	fi
  	@$(java-vm-cleanup)
  
--- a/patches/boot/jaxws-jdk-dependency.patch	Mon May 21 19:18:12 2012 +0100
+++ b/patches/boot/jaxws-jdk-dependency.patch	Wed May 23 15:32:36 2012 +0100
@@ -5,7 +5,7 @@
  jaxp.classes.dir=${output.dir}/../jaxp/build/classes
  
 +# JDK sources
-+jdk.sources=${jdk.topdir}/src/share/classes
++jdk.sources=${jdk.topdir}/src/share/classes:${jdk.topdir}/src/solaris/classes
 +
  # Distributed results
  dist.dir=${output.dir}/dist
--- a/patches/boot/xbootclasspath.patch	Mon May 21 19:18:12 2012 +0100
+++ b/patches/boot/xbootclasspath.patch	Wed May 23 15:32:36 2012 +0100
@@ -6,7 +6,7 @@
  JAVACFLAGS  += $(CLASS_VERSION)
  JAVACFLAGS  += -encoding ascii
 -JAVACFLAGS  += -classpath $(BOOTDIR)/lib/tools.jar
-+JAVACFLAGS  += -classpath $(BOOTDIR)/lib/rt.jar
++JAVACFLAGS  += -classpath $(LANGTOOLS_DIST)/lib/classes.jar
  JAVACFLAGS  += $(OTHER_JAVACFLAGS)
  
  # Langtools