changeset in /hg/icedtea6: 2008-08-08 Joshua Sumali <jsumali at r...

[Joshua Sumali]

changeset a86e963e785f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a86e963e785f
description:
	2008-08-08  Joshua Sumali  <jsumali at redhat.com>

	        * Makefile.am: Add ALT_JAR_CMD to ICEDTEA_ENV if --with-alt-jar is used.
	        Added patches/icedtea-alt-jar.patch.
	        * acinclude.m4: Define --with-alt-jar.
	        * configure.ac: Add --with-alt-jar.
	        * patches/icedtea-alt-jar.patch: New file.
	        * HACKING: Updated.

diffstat:

6 files changed, 49 insertions(+)
ChangeLog                     |    9 +++++++++
HACKING                       |    1 +
Makefile.am                   |    6 ++++++
acinclude.m4                  |   17 +++++++++++++++++
configure.ac                  |    1 +
patches/icedtea-alt-jar.patch |   15 +++++++++++++++

diffs (107 lines):

diff -r df71bbb2f1ad -r a86e963e785f ChangeLog
--- a/ChangeLog	Fri Aug 08 12:17:05 2008 -0400
+++ b/ChangeLog	Fri Aug 08 12:26:14 2008 -0400
@@ -1,3 +1,12 @@ 2008-08-08  Gary Benson  <gbenson at redhat
+2008-08-08  Joshua Sumali  <jsumali at redhat.com>
+
+	* Makefile.am: Add ALT_JAR_CMD to ICEDTEA_ENV if --with-alt-jar is used.
+	Added patches/icedtea-alt-jar.patch.
+	* acinclude.m4: Define --with-alt-jar.
+	* configure.ac: Add --with-alt-jar.
+	* patches/icedtea-alt-jar.patch: New file.
+	* HACKING: Updated.
+
 2008-08-08  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
diff -r df71bbb2f1ad -r a86e963e785f HACKING
--- a/HACKING	Fri Aug 08 12:17:05 2008 -0400
+++ b/HACKING	Fri Aug 08 12:26:14 2008 -0400
@@ -64,6 +64,7 @@ The following patches are currently appl
 * icedtea-hotspot-citypeflow.patch: Fix hotspot miscompilation with GCC 4.3 on x86.
 * icedtea-alpha-fixes.patch: Fix build issues on alpha-linux.
 * icedtea-arch.patch: Add support for additional architectures.
+* icedtea-alt-jar.patch: Add support for using an alternate jar tool in JDK building. 
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r df71bbb2f1ad -r a86e963e785f Makefile.am
--- a/Makefile.am	Fri Aug 08 12:17:05 2008 -0400
+++ b/Makefile.am	Fri Aug 08 12:26:14 2008 -0400
@@ -168,6 +168,11 @@ if !ENABLE_DOCS
 if !ENABLE_DOCS
 ICEDTEA_ENV += \
 	"NO_DOCS=true"
+endif
+
+if USE_ALT_JAR
+ICEDTEA_ENV += \
+	"ALT_JAR_CMD=$(ALT_JAR_CMD)"
 endif
 
 env:
@@ -494,6 +499,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-hotspot-gcc-pr36917.patch \
 	patches/icedtea-hotspot-citypeflow.patch \
 	patches/icedtea-alpha-fixes.patch \
+	patches/icedtea-alt-jar.patch \
 	$(SHARK_PATCH) \
 	$(GCC_PATCH) \
 	patches/icedtea-arch.patch
diff -r df71bbb2f1ad -r a86e963e785f acinclude.m4
--- a/acinclude.m4	Fri Aug 08 12:17:05 2008 -0400
+++ b/acinclude.m4	Fri Aug 08 12:26:14 2008 -0400
@@ -488,6 +488,23 @@ AC_DEFUN([WITH_NETBEANS_PROFILER_SRC_ZIP
   AC_SUBST(ALT_NETBEANS_PROFILER_SRC_ZIP)
 ])
 
+AC_DEFUN([WITH_ALT_JAR_BINARY],
+[
+  AC_MSG_CHECKING(alternate jar command)
+  AC_ARG_WITH([alt-jar],
+              [AS_HELP_STRING(--with-alt-jar, specify the location of an alternate jar binary to use for building)],
+  [
+    ALT_JAR_CMD=${withval}
+    AM_CONDITIONAL(USE_ALT_JAR, test x = x)
+  ],
+  [ 
+    ALT_JAR_CMD="not specified"
+    AM_CONDITIONAL(USE_ALT_JAR, test x != x)
+  ])
+  AC_MSG_RESULT(${ALT_JAR_CMD})
+  AC_SUBST(ALT_JAR_CMD)
+])
+
 AC_DEFUN([FIND_XALAN2_JAR],
 [
   AC_ARG_WITH([xalan2-jar],
diff -r df71bbb2f1ad -r a86e963e785f configure.ac
--- a/configure.ac	Fri Aug 08 12:17:05 2008 -0400
+++ b/configure.ac	Fri Aug 08 12:26:14 2008 -0400
@@ -220,6 +220,7 @@ WITH_VISUALVM_SRC_ZIP
 WITH_VISUALVM_SRC_ZIP
 WITH_NETBEANS_PLATFORM_SRC_ZIP
 WITH_NETBEANS_PROFILER_SRC_ZIP
+WITH_ALT_JAR_BINARY
 AC_CHECK_WITH_CACAO
 AC_CHECK_WITH_CACAO_HOME
 AC_CHECK_WITH_CACAO_SRC_ZIP
diff -r df71bbb2f1ad -r a86e963e785f patches/icedtea-alt-jar.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-alt-jar.patch	Fri Aug 08 12:26:14 2008 -0400
@@ -0,0 +1,15 @@
+--- openjdk.orig/jdk/make/common/shared/Defs-java.gmk	2008-05-30 03:50:36.000000000 -0400
++++ openjdk/jdk/make/common/shared/Defs-java.gmk	2008-08-06 11:18:26.000000000 -0400
+@@ -187,7 +181,11 @@
+ 
+ BOOT_JAVA_CMD      = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
+ BOOT_JAVAC_CMD     = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
+-BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar
++ifdef ALT_JAR_CMD
++  BOOT_JAR_CMD       = $(ALT_JAR_CMD)
++else
++  BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar
++endif
+ BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner
+ 
+ # Various tools we need to run (FIXUP: Are these the right ones?)