changeset in /hg/icedtea: Update patches for b26 and properly ha...
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Thu May 29 14:13:49 PDT 2008
changeset 7fe297d305d6 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7fe297d305d6
description:
Update patches for b26 and properly handle reverting
OpenJDK patches.
diffstat:
10 files changed, 5777 insertions(+), 5778 deletions(-)
ChangeLog | 14
Makefile.am | 12
Makefile.in | 26
patches/icedtea-ant.patch | 80
patches/icedtea-core-build.patch | 303
patches/icedtea-libraries.patch |10611 ++++++++++++++++----------------
patches/icedtea-memory-limits.patch | 14
patches/icedtea-static-libstdc++.patch | 29
patches/icedtea-sunsrc.patch | 18
patches/icedtea-zero-build.patch | 448 -
diffs (truncated from 12171 to 500 lines):
diff -r 37daefcd1e86 -r 7fe297d305d6 ChangeLog
--- a/ChangeLog Fri May 23 21:30:20 2008 +0100
+++ b/ChangeLog Sat May 24 00:33:11 2008 +0100
@@ -1,3 +1,17 @@ 2008-05-23 Andrew John Hughes <gnu_and
+2008-05-24 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am: Revert OpenJDK patches
+ last and use -p1.
+ * Makefile.in: Regenerated.
+ * patches/icedtea-ant.patch,
+ * patches/icedtea-core-build.patch,
+ * patches/icedtea-libraries.patch,
+ * patches/icedtea-memory-limits.patch,
+ * patches/icedtea-static-libstdc++.patch,
+ * patches/icedtea-sunsrc.patch,
+ * patches/icedtea-zero-build.patch:
+ Updated for b26.
+
2008-05-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/icedtea-headers.patch: Updated
diff -r 37daefcd1e86 -r 7fe297d305d6 Makefile.am
--- a/Makefile.am Fri May 23 21:30:20 2008 +0100
+++ b/Makefile.am Sat May 24 00:33:11 2008 +0100
@@ -385,8 +385,7 @@ clean-patch:
clean-patch:
rm -f stamps/patch.stamp
all_patches_ok=yes; \
- cd $(abs_top_builddir)/openjdk/jdk; \
- for p in $(OPENJDK_PATCHES) ; \
+ for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
@@ -397,18 +396,19 @@ clean-patch:
all_patches_ok=no ; \
fi ; \
done ; \
- cd $(abs_top_builddir) ; \
- for p in $(ICEDTEA_PATCHES) ; \
+ cd $(abs_top_builddir)/openjdk/jdk; \
+ for p in $(OPENJDK_PATCHES) ; \
do \
echo Checking $$p ; \
- if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
+ if $(PATCH) -l -p1 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
then \
echo Reverting $$p ; \
- $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
+ $(PATCH) -l -p1 -R < $(abs_top_srcdir)/$$p ; \
else \
all_patches_ok=no ; \
fi ; \
done ; \
+ cd $(abs_top_builddir) ; \
if ! test x$${all_patches_ok} == "xyes" ; then \
echo "WARNING Not all patches reverted cleanly" ; \
fi
diff -r 37daefcd1e86 -r 7fe297d305d6 Makefile.in
--- a/Makefile.in Fri May 23 21:30:20 2008 +0100
+++ b/Makefile.in Sat May 24 00:33:11 2008 +0100
@@ -891,19 +891,6 @@ clean-patch:
clean-patch:
rm -f stamps/patch.stamp
all_patches_ok=yes; \
- cd $(abs_top_builddir)/openjdk/jdk; \
- for p in $(OPENJDK_PATCHES) ; \
- do \
- echo Checking $$p ; \
- if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
- then \
- echo Reverting $$p ; \
- $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
- else \
- all_patches_ok=no ; \
- fi ; \
- done ; \
- cd $(abs_top_builddir) ; \
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
@@ -915,6 +902,19 @@ clean-patch:
all_patches_ok=no ; \
fi ; \
done ; \
+ cd $(abs_top_builddir)/openjdk/jdk; \
+ for p in $(OPENJDK_PATCHES) ; \
+ do \
+ echo Checking $$p ; \
+ if $(PATCH) -l -p1 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
+ then \
+ echo Reverting $$p ; \
+ $(PATCH) -l -p1 -R < $(abs_top_srcdir)/$$p ; \
+ else \
+ all_patches_ok=no ; \
+ fi ; \
+ done ; \
+ cd $(abs_top_builddir) ; \
if ! test x$${all_patches_ok} == "xyes" ; then \
echo "WARNING Not all patches reverted cleanly" ; \
fi
diff -r 37daefcd1e86 -r 7fe297d305d6 patches/icedtea-ant.patch
--- a/patches/icedtea-ant.patch Fri May 23 21:30:20 2008 +0100
+++ b/patches/icedtea-ant.patch Sat May 24 00:33:11 2008 +0100
@@ -1,5 +1,6 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.orig 2007-10-14 17:34:43.000000000 -0400
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2007-10-14 17:33:44.000000000 -0400
+diff -Nru openjdk.orig/corba/make/common/shared/Defs-utils.gmk openjdk/corba/make/common/shared/Defs-utils.gmk
+--- openjdk.orig/corba/make/common/shared/Defs-utils.gmk 2008-05-23 22:16:25.000000000 +0100
++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-05-23 22:09:43.000000000 +0100
@@ -71,7 +71,7 @@
ifndef ANT_HOME
ANT_HOME = $(JDK_DEVTOOLS_DIR)/share/ant/latest
@@ -9,30 +10,9 @@
ifndef FINDBUGS_HOME
FINDBUGS_HOME = $(JDK_DEVTOOLS_DIR)/share/findbugs/latest
endif
---- openjdk.orig/langtools/make/Makefile 2007-10-12 03:47:30.000000000 -0400
-+++ openjdk/langtools/make/Makefile 2007-10-12 17:11:46.000000000 -0400
-@@ -133,16 +133,9 @@
- ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
- endif
-
--ifdef ANT_HOME
-- ANT = $(ANT_HOME)/bin/ant
-- ifneq ($(shell test -x $(ANT) && echo OK), OK)
-- $(error $(ANT) not found -- please update ANT_HOME)
-- endif
--else
-- ANT = ant
-- ifneq ($(shell test -x "`which $(ANT)`" && echo OK), OK)
-- $(error 'ant' not found -- please set ANT_HOME or put 'ant' on your PATH)
-- endif
-+ANT = ant
-+ifneq ($(shell test -x "`which $(ANT)`" && echo OK), OK)
-+ $(error 'ant' not found -- please put 'ant' on your PATH)
- endif
-
- # Default target and expected 'do everything' target
---- openjdk/jaxp/make/Makefile.orig 2007-10-14 21:50:24.000000000 -0400
-+++ openjdk/jaxp/make/Makefile 2007-10-14 21:50:56.000000000 -0400
+diff -Nru openjdk.orig/jaxp/make/Makefile openjdk/jaxp/make/Makefile
+--- openjdk.orig/jaxp/make/Makefile 2008-05-23 22:16:25.000000000 +0100
++++ openjdk/jaxp/make/Makefile 2008-05-23 22:14:29.000000000 +0100
@@ -99,16 +99,9 @@
ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
endif
@@ -49,23 +29,13 @@
- endif
+ANT = ant
+ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0)
-+ $(error "\"ant\" not found; please put \"ant\" on your PATH")
++ $(error "\"ant\" not found; please set ANT_HOME or put \"ant\" on your PATH")
endif
# Default target and expected 'do everything' target
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.orig 2007-10-14 17:35:02.000000000 -0400
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2007-10-14 17:34:07.000000000 -0400
-@@ -71,7 +71,7 @@
- ifndef ANT_HOME
- ANT_HOME = $(JDK_DEVTOOLS_DIR)/share/ant/latest
- endif
--ANT = $(ANT_HOME)/bin/ant
-+ANT = ant
- ifndef FINDBUGS_HOME
- FINDBUGS_HOME = $(JDK_DEVTOOLS_DIR)/share/findbugs/latest
- endif
---- iopenjdk/jaxws/make/Makefile 2007-10-12 03:52:21.000000000 -0400
-+++ openjdk/jaxws/make/Makefile 2007-11-13 11:02:07.000000000 -0500
+diff -Nru openjdk.orig/jaxws/make/Makefile openjdk/jaxws/make/Makefile
+--- openjdk.orig/jaxws/make/Makefile 2008-05-23 22:16:25.000000000 +0100
++++ openjdk/jaxws/make/Makefile 2008-05-23 22:13:11.000000000 +0100
@@ -80,6 +80,7 @@
endif
@@ -94,9 +64,10 @@
endif
# Default target and expected 'do everything' target
---- iopenjdk/jaxws/make/build.xml 2007-10-12 03:52:21.000000000 -0400
-+++ openjdk/jaxws/make/build.xml 2007-11-13 11:02:43.000000000 -0500
-@@ -109,6 +109,7 @@
+diff -Nru openjdk.orig/jaxws/make/build.xml openjdk/jaxws/make/build.xml
+--- openjdk.orig/jaxws/make/build.xml 2008-05-23 22:16:25.000000000 +0100
++++ openjdk/jaxws/make/build.xml 2008-05-23 22:13:44.000000000 +0100
+@@ -100,6 +100,7 @@
memoryMaximumSize="${javac.memoryMaximumSize}"
target="${javac.target}"
excludes="com/sun/tools/internal/txw2/**">
@@ -104,3 +75,26 @@
<compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
<compilerarg line="${javac.version.opt}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
+diff -Nru openjdk.orig/langtools/make/Makefile openjdk/langtools/make/Makefile
+--- openjdk.orig/langtools/make/Makefile 2008-05-23 22:16:25.000000000 +0100
++++ openjdk/langtools/make/Makefile 2008-05-23 22:10:35.000000000 +0100
+@@ -133,16 +133,9 @@
+ ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
+ endif
+
+-ifdef ANT_HOME
+- ANT = $(ANT_HOME)/bin/ant
+- ifneq ($(shell test -x $(ANT) && echo OK), OK)
+- $(error $(ANT) not found -- please update ANT_HOME)
+- endif
+-else
+- ANT = ant
+- ifneq ($(shell test -x "`which $(ANT)`" && echo OK), OK)
+- $(error 'ant' not found -- please set ANT_HOME or put 'ant' on your PATH)
+- endif
++ANT = ant
++ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0)
++ $(error "\"ant\" not found; please put \"ant\" on your PATH")
+ endif
+
+ # Default target and expected 'do everything' target
diff -r 37daefcd1e86 -r 7fe297d305d6 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch Fri May 23 21:30:20 2008 +0100
+++ b/patches/icedtea-core-build.patch Sat May 24 00:33:11 2008 +0100
@@ -1,21 +1,24 @@ diff -ru openjdk.orig/control/make/make/
-diff -ru openjdk.orig/control/make/make/hotspot-rules.gmk openjdk/control/make/hotspot-rules.gmk
---- openjdk.orig/control/make/make/hotspot-rules.gmk 2007-10-12 08:45:09.000000000 +0100
-+++ openjdk/control/make/make/hotspot-rules.gmk 2007-11-08 09:40:57.000000000 +0000
-@@ -72,6 +72,10 @@
- HOTSPOT_TARGET = all_fastdebug
- endif
+diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
+--- openjdk.orig/corba/make/common/Defs-linux.gmk 2008-05-16 22:13:14.000000000 +0100
++++ openjdk/corba/make/common/Defs-linux.gmk 2008-05-23 23:04:55.000000000 +0100
+@@ -250,7 +250,12 @@
+ # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
+ # the library itself should not.
+ #
+-VM_NAME = server
++VM_NAME = $(shell for dir in server client core; do \
++ if [ -d $(BOOTDIR)/jre/lib/$(LIBARCH)/$$dir ]; then \
++ echo $$dir; \
++ break; \
++ fi; \
++ done)
+ JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
+ JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
-+ifdef ICEDTEA_CORE_BUILD
-+ HOTSPOT_TARGET := $(HOTSPOT_TARGET)core
-+endif
-+
- HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
- HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
- HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
-diff -u openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make
---- openjdk.orig/hotspot/build/linux/makefiles/defs.make 2008-01-31 14:19:00.000000000 +0000
-+++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-02-01 15:57:40.000000000 +0000
-@@ -97,6 +97,7 @@ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusa
+diff -Nru openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make
+--- openjdk.orig/hotspot/build/linux/makefiles/defs.make 2008-05-16 22:13:31.000000000 +0100
++++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-05-23 23:04:55.000000000 +0100
+@@ -97,6 +97,7 @@
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
@@ -23,47 +26,106 @@ diff -u openjdk.orig/hotspot/build/linux
ifeq ($(ARCH_DATA_MODEL), 32)
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-@@ -111,3 +112,4 @@ else
+@@ -111,3 +112,4 @@
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
endif
endif
+endif
-diff -ru openjdk.orig/jdk/make/java/redist/Makefile openjdk/jdk/make/java/redist/Makefile
---- openjdk.orig/jdk/make/java/redist/Makefile 2008-01-31 14:20:37.000000000 +0000
-+++ openjdk/jdk/make/java/redist/Makefile 2008-02-04 10:11:04.000000000 +0000
-@@ -95,9 +95,11 @@ endif # INCLUDE_SA
- endif # INCLUDE_SA
+diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
+--- openjdk.orig/hotspot/make/Makefile 2008-05-16 22:13:31.000000000 +0100
++++ openjdk/hotspot/make/Makefile 2008-05-23 23:09:47.000000000 +0100
+@@ -91,6 +91,15 @@
+ all_debug: jvmg jvmg1 jvmgkernel docs export_debug
+ all_optimized: optimized optimized1 optimizedkernel docs export_optimized
- # Hotspot client is only available on 32-bit builds
-+ifndef ICEDTEA_CORE_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
- $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
-+endif
++# Core (non-compiler) targets made available with this Makefile
++CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
++
++allcore: all_productcore all_fastdebugcore
++all_productcore: productcore docs export_product
++all_fastdebugcore: fastdebugcore docs export_fastdebug
++all_debugcore: jvmgcore docs export_debug
++all_optimizedcore: optimizedcore docs export_optimized
++
+ # Do everything
+ world: all create_jdk
+
+@@ -113,6 +122,10 @@
+ $(CD) $(GAMMADIR)/make; \
+ $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
+
++$(CORE_VM_TARGETS):
++ $(CD) $(GAMMADIR)/make; \
++ $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
++
+ $(KERNEL_VM_TARGETS):
+ $(CD) $(GAMMADIR)/make; \
+ $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
+@@ -159,6 +172,12 @@
+ $(MAKE_ARGS) $(VM_TARGET)
endif
- ifeq ($(PLATFORM), windows)
-@@ -161,6 +163,7 @@ ifeq ($(PLATFORM), solaris)
- IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
- endif
++generic_buildcore:
++ $(MKDIR) -p $(OUTPUTDIR)
++ $(CD) $(OUTPUTDIR); \
++ $(MAKE) -f $(ABS_OS_MAKEFILE) \
++ $(MAKE_ARGS) $(VM_TARGET)
++
+ generic_buildkernel:
+ $(MKDIR) -p $(OUTPUTDIR)
+ ifeq ($(OSNAME),windows)
+@@ -205,13 +224,21 @@
+ XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
+ DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
+ C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
++ifdef ICEDTEA_CORE_BUILD
++C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
++else
+ C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
++endif
+ KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
+ C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
+ C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
+ KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
-+ifndef ICEDTEA_CORE_BUILD
+ # Misc files and generated files need to come from C1 or C2 area
++ifdef ICEDTEA_CORE_BUILD
++ MISC_DIR=$(C2_DIR)
++ GEN_DIR=$(C2_BASE_DIR)/generated
++else
ifeq ($(ARCH_DATA_MODEL), 32)
+ MISC_DIR=$(C1_DIR)
+ GEN_DIR=$(C1_BASE_DIR)/generated
+@@ -219,6 +246,7 @@
+ MISC_DIR=$(C2_DIR)
+ GEN_DIR=$(C2_BASE_DIR)/generated
+ endif
++endif
- IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
-@@ -190,6 +193,8 @@ endif # 32bit solaris
- endif # 32bit solaris
+ # Bin files (windows)
+ ifeq ($(OSNAME),windows)
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2008-05-19 22:56:22.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-05-23 23:12:10.000000000 +0100
+@@ -94,8 +94,12 @@
+ #ifdef TIERED
+ #define VMTYPE "Server"
+ #else
+- #define VMTYPE COMPILER1_PRESENT("Client") \
+- COMPILER2_PRESENT("Server")
++#if defined(COMPILER1) || defined(COMPILER2)
++ #define VMTYPE COMPILER1_PRESENT("Client") \
++ COMPILER2_PRESENT("Server")
++#else
++ #define VMTYPE "Core"
++#endif // COMPILER1 || COMPILER2
+ #endif // TIERED
+ #endif // KERNEL
- endif # 32bit
-+
-+endif # ICEDTEA_CORE_BUILD
-
- # NOT Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ NOT Windows
-
-diff -ru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2007-11-08 11:35:35.000000000 +0000
-+++ openjdk/jdk/make/common/Defs-linux.gmk 2007-11-08 11:36:15.000000000 +0000
-@@ -258,7 +258,12 @@ endif
+diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
+--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2008-05-23 22:59:36.000000000 +0100
++++ openjdk/jdk/make/common/Defs-linux.gmk 2008-05-23 23:04:55.000000000 +0100
+@@ -258,7 +258,12 @@
# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
# the library itself should not.
#
@@ -77,117 +139,50 @@ diff -ru openjdk.orig/jdk/make/common/De
JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
JAVALIB = -ljava $(JVMLIB)
-diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
---- openjdk.orig/corba/make/common/Defs-linux.gmk Tue Feb 05 15:52:33 2008 +0000
-+++ openjdk/corba/make/common/Defs-linux.gmk Mon Feb 11 10:01:46 2008 +0000
-@@ -250,7 +254,12 @@ endif
- # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
- # the library itself should not.
- #
--VM_NAME = server
-+VM_NAME = $(shell for dir in server client core; do \
-+ if [ -d $(BOOTDIR)/jre/lib/$(LIBARCH)/$$dir ]; then \
-+ echo $$dir; \
-+ break; \
-+ fi; \
-+ done)
- JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
- JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
+diff -Nru openjdk.orig/jdk/make/java/redist/Makefile openjdk/jdk/make/java/redist/Makefile
+--- openjdk.orig/jdk/make/java/redist/Makefile 2008-05-16 22:15:14.000000000 +0100
++++ openjdk/jdk/make/java/redist/Makefile 2008-05-23 23:04:55.000000000 +0100
+@@ -95,10 +95,12 @@
+ endif # INCLUDE_SA
-diff -r 79d639c8a75f openjdk/hotspot/make/Makefile
---- openjdk/hotspot/make/Makefile Wed Apr 16 08:42:01 2008 +0100
-+++ openjdk/hotspot/make/Makefile Wed Apr 16 08:49:31 2008 +0100
-@@ -90,6 +90,15 @@ all_debug: jvmg jvmg1 docs export_de
- all_debug: jvmg jvmg1 docs export_debug
- all_optimized: optimized optimized1 docs export_optimized
-
-+# Core (non-compiler) targets made available with this Makefile
-+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
-+
-+allcore: all_productcore all_fastdebugcore
-+all_productcore: productcore docs export_product
-+all_fastdebugcore: fastdebugcore docs export_fastdebug
-+all_debugcore: jvmgcore docs export_debug
-+all_optimizedcore: optimizedcore docs export_optimized
-+
- # Do everything
- world: all create_jdk
-
-@@ -111,6 +120,10 @@ endif
- $(C2_VM_TARGETS):
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
-+
-+$(CORE_VM_TARGETS):
-+ $(CD) $(GAMMADIR)/make; \
-+ $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
-
- # Build compiler1 (client) rule, different for platforms
- generic_build1:
-@@ -153,6 +166,12 @@ else
- $(MAKE) -f $(ABS_OS_MAKEFILE) \
- $(MAKE_ARGS) $(VM_TARGET)
- endif
-+
-+generic_buildcore:
-+ $(MKDIR) -p $(OUTPUTDIR)
-+ $(CD) $(OUTPUTDIR); \
-+ $(MAKE) -f $(ABS_OS_MAKEFILE) \
-+ $(MAKE_ARGS) $(VM_TARGET)
-
- # Export file rule
- generic_export: $(EXPORT_LIST)
-@@ -182,11 +201,19 @@ XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
- XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
- DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
- C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
-+ifdef ICEDTEA_CORE_BUILD
-+C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
-+else
- C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
-+endif
- C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
- C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
-
- # Misc files and generated files need to come from C1 or C2 area
-+ifdef ICEDTEA_CORE_BUILD
-+ MISC_DIR=$(C2_DIR)
-+ GEN_DIR=$(C2_BASE_DIR)/generated
-+else
+ # Hotspot client is only available on 32-bit builds
++ifndef ICEDTEA_CORE_BUILD
ifeq ($(ARCH_DATA_MODEL), 32)
- MISC_DIR=$(C1_DIR)
- GEN_DIR=$(C1_BASE_DIR)/generated
-@@ -194,6 +221,7 @@ else
- MISC_DIR=$(C2_DIR)
- GEN_DIR=$(C2_BASE_DIR)/generated
+ IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
+ $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
endif
+endif
- # Bin files (windows)
- ifeq ($(OSNAME),windows)
-@@ -264,6 +292,7 @@ endif
More information about the distro-pkg-dev
mailing list