changeset in /hg/icedtea: 2008-02-13 Gary Benson <gbenson at redh...
Gary Benson
gbenson at redhat.com
Thu May 29 14:11:43 PDT 2008
changeset 43edef9724f0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=43edef9724f0
description:
2008-02-13 Gary Benson <gbenson at redhat.com>
* acinclude.m4 (SET_CORE_BUILD): New check.
* configure.ac: Call the above.
* Makefile.am
(ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Add ICEDTEA_CORE_BUILD.
(hotspot): Updated libjvm.so location.
* configure, Makefile.in: Regenerated.
* patches/icedtea-ports.patch: Use zero on ppc and ppc64.
Removed everything relating to the ppc-specific port.
Moved several hunks into icedtea-core-build.patch.
* patches/icedtea-core-build.patch: Completely reworked.
* ports/hotspot/build/linux/makefiles/ppc.make: Use zero.
* ports/hotspot/build/linux/makefiles/ppc64.make: Likewise.
* ports/hotspot/build/linux/platform_ppc: Likewise.
* ports/hotspot/build/linux/platform_ppc64: Likewise.
* ports/jdk/src/solaris/bin/alpha/jvm.cfg: Change default to core.
* ports/jdk/src/solaris/bin/arm/jvm.cfg: Likewise.
* ports/jdk/src/solaris/bin/mips/jvm.cfg: Likewise.
* ports/jdk/src/solaris/bin/ppc/jvm.cfg: Likewise.
* ports/jdk/src/solaris/bin/ppc64/jvm.cfg: Likewise.
* ports/jdk/src/solaris/bin/s390/jvm.cfg: Likewise.
* ports/jdk/src/solaris/bin/s390x/jvm.cfg: Likewise.
diffstat:
19 files changed, 355 insertions(+), 305 deletions(-)
ChangeLog | 27 ++
Makefile.am | 10
Makefile.in | 5
acinclude.m4 | 12 +
configure | 14 +
configure.ac | 1
patches/icedtea-core-build.patch | 275 +++++++++++++++++++++---
patches/icedtea-ports.patch | 251 +--------------------
ports/hotspot/build/linux/makefiles/ppc.make | 5
ports/hotspot/build/linux/makefiles/ppc64.make | 5
ports/hotspot/build/linux/platform_ppc | 10
ports/hotspot/build/linux/platform_ppc64 | 10
ports/jdk/src/solaris/bin/alpha/jvm.cfg | 5
ports/jdk/src/solaris/bin/arm/jvm.cfg | 5
ports/jdk/src/solaris/bin/mips/jvm.cfg | 5
ports/jdk/src/solaris/bin/ppc/jvm.cfg | 5
ports/jdk/src/solaris/bin/ppc64/jvm.cfg | 5
ports/jdk/src/solaris/bin/s390/jvm.cfg | 5
ports/jdk/src/solaris/bin/s390x/jvm.cfg | 5
diffs (truncated from 1054 to 500 lines):
diff -r e1f5ee2e2c0e -r 43edef9724f0 ChangeLog
--- a/ChangeLog Mon Feb 11 14:25:34 2008 -0500
+++ b/ChangeLog Wed Feb 13 08:23:39 2008 -0500
@@ -1,3 +1,30 @@ 2008-02-11 Lillian Angel <langel at redha
+2008-02-13 Gary Benson <gbenson at redhat.com>
+
+ * acinclude.m4 (SET_CORE_BUILD): New check.
+ * configure.ac: Call the above.
+ * Makefile.am
+ (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Add ICEDTEA_CORE_BUILD.
+ (hotspot): Updated libjvm.so location.
+ * configure, Makefile.in: Regenerated.
+
+ * patches/icedtea-ports.patch: Use zero on ppc and ppc64.
+ Removed everything relating to the ppc-specific port.
+ Moved several hunks into icedtea-core-build.patch.
+ * patches/icedtea-core-build.patch: Completely reworked.
+
+ * ports/hotspot/build/linux/makefiles/ppc.make: Use zero.
+ * ports/hotspot/build/linux/makefiles/ppc64.make: Likewise.
+ * ports/hotspot/build/linux/platform_ppc: Likewise.
+ * ports/hotspot/build/linux/platform_ppc64: Likewise.
+
+ * ports/jdk/src/solaris/bin/alpha/jvm.cfg: Change default to core.
+ * ports/jdk/src/solaris/bin/arm/jvm.cfg: Likewise.
+ * ports/jdk/src/solaris/bin/mips/jvm.cfg: Likewise.
+ * ports/jdk/src/solaris/bin/ppc/jvm.cfg: Likewise.
+ * ports/jdk/src/solaris/bin/ppc64/jvm.cfg: Likewise.
+ * ports/jdk/src/solaris/bin/s390/jvm.cfg: Likewise.
+ * ports/jdk/src/solaris/bin/s390x/jvm.cfg: Likewise.
+
2008-02-11 Lillian Angel <langel at redhat.com>
* patches/icedtea-libraries.patch: Changed to dlopen libjpeg.so.62
diff -r e1f5ee2e2c0e -r 43edef9724f0 Makefile.am
--- a/Makefile.am Mon Feb 11 14:25:34 2008 -0500
+++ b/Makefile.am Wed Feb 13 08:23:39 2008 -0500
@@ -63,7 +63,8 @@ ICEDTEA_ENV = \
"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
"CLASSPATH=" \
"LD_LIBRARY_PATH=" \
- "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
+ "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
+ "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)"
if WITH_CACAO
ICEDTEA_ENV += \
@@ -103,7 +104,8 @@ ICEDTEA_ENV_ECJ = \
"CLASSPATH=" \
"LD_LIBRARY_PATH=" \
"GENSRCDIR=$(abs_top_srcdir)/generated" \
- "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)"
+ "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
+ "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)"
if WITH_CACAO
ICEDTEA_ENV_ECJ += \
@@ -509,8 +511,8 @@ hotspot:
rm -f stamps/icedtea-ecj.stamp
rm -f stamps/icedtea-against-ecj.stamp
$(MAKE) hotspot-helper
- cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/client/libjvm.so \
- openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/client
+ cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/core/libjvm.so \
+ openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/core
@echo "Hotspot is served:" openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image
hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
diff -r e1f5ee2e2c0e -r 43edef9724f0 Makefile.in
--- a/Makefile.in Mon Feb 11 14:25:34 2008 -0500
+++ b/Makefile.in Wed Feb 13 08:23:39 2008 -0500
@@ -108,6 +108,7 @@ GREP = @GREP@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
+ICEDTEA_CORE_BUILD = @ICEDTEA_CORE_BUILD@
INSTALL = @INSTALL@
INSTALL_ARCH_DIR = @INSTALL_ARCH_DIR@
INSTALL_DATA = @INSTALL_DATA@
@@ -969,8 +970,8 @@ hotspot:
rm -f stamps/icedtea-ecj.stamp
rm -f stamps/icedtea-against-ecj.stamp
$(MAKE) hotspot-helper
- cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/client/libjvm.so \
- openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/client
+ cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/core/libjvm.so \
+ openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/core
@echo "Hotspot is served:" openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image
hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
diff -r e1f5ee2e2c0e -r 43edef9724f0 acinclude.m4
--- a/acinclude.m4 Mon Feb 11 14:25:34 2008 -0500
+++ b/acinclude.m4 Wed Feb 13 08:23:39 2008 -0500
@@ -16,6 +16,18 @@ AC_DEFUN([SET_ARCH_DIRS],
esac
AC_SUBST(BUILD_ARCH_DIR)
AC_SUBST(INSTALL_ARCH_DIR)
+])
+
+AC_DEFUN([SET_CORE_BUILD],
+[
+ if test -f "ports/hotspot/build/linux/platform_${BUILD_ARCH_DIR}" && \
+ grep -q "arch.*=.*zero" "ports/hotspot/build/linux/platform_${BUILD_ARCH_DIR}"
+ then
+ ICEDTEA_CORE_BUILD=yes
+ else
+ ICEDTEA_CORE_BUILD=
+ fi
+ AC_SUBST(ICEDTEA_CORE_BUILD)
])
AC_DEFUN([FIND_JAVAC],
diff -r e1f5ee2e2c0e -r 43edef9724f0 configure
--- a/configure Mon Feb 11 14:25:34 2008 -0500
+++ b/configure Wed Feb 13 08:23:39 2008 -0500
@@ -720,6 +720,7 @@ WITH_ICEDTEA_FALSE
WITH_ICEDTEA_FALSE
BUILD_ARCH_DIR
INSTALL_ARCH_DIR
+ICEDTEA_CORE_BUILD
JAVA
JAVAC
JAVAH
@@ -4986,6 +4987,16 @@ fi
;;
esac
+
+
+
+ if test -f "ports/hotspot/build/linux/platform_${BUILD_ARCH_DIR}" && \
+ grep -q "arch.*=.*zero" "ports/hotspot/build/linux/platform_${BUILD_ARCH_DIR}"
+ then
+ ICEDTEA_CORE_BUILD=yes
+ else
+ ICEDTEA_CORE_BUILD=
+ fi
if test "${with_icedtea}" == true
@@ -10827,6 +10838,7 @@ WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$a
WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$ac_delim
BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
+ICEDTEA_CORE_BUILD!$ICEDTEA_CORE_BUILD$ac_delim
JAVA!$JAVA$ac_delim
JAVAC!$JAVAC$ac_delim
JAVAH!$JAVAH$ac_delim
@@ -10884,7 +10896,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 61; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r e1f5ee2e2c0e -r 43edef9724f0 configure.ac
--- a/configure.ac Mon Feb 11 14:25:34 2008 -0500
+++ b/configure.ac Wed Feb 13 08:23:39 2008 -0500
@@ -96,6 +96,7 @@ AM_CONDITIONAL(WITH_ICEDTEA, test "${wit
AM_CONDITIONAL(WITH_ICEDTEA, test "${with_icedtea}" == true)
SET_ARCH_DIRS
+SET_CORE_BUILD
if test "${with_icedtea}" == true
then
JAVA=$SYSTEM_ICEDTEA_DIR/bin/java
diff -r e1f5ee2e2c0e -r 43edef9724f0 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch Mon Feb 11 14:25:34 2008 -0500
+++ b/patches/icedtea-core-build.patch Wed Feb 13 08:23:39 2008 -0500
@@ -1,12 +1,11 @@ diff -ru openjdk.orig/control/make/hotsp
diff -ru openjdk.orig/control/make/hotspot-rules.gmk openjdk/control/make/hotspot-rules.gmk
--- openjdk.orig/control/make/hotspot-rules.gmk 2007-10-12 08:45:09.000000000 +0100
+++ openjdk/make/hotspot-rules.gmk 2007-11-08 09:40:57.000000000 +0000
-@@ -72,6 +72,11 @@
+@@ -72,6 +72,10 @@
HOTSPOT_TARGET = all_fastdebug
endif
-+# Use the special build targets on PPC for now
-+ifneq ($(filter ppc ppc64,$(ARCH)),)
++ifdef ICEDTEA_CORE_BUILD
+ HOTSPOT_TARGET := $(HOTSPOT_TARGET)core
+endif
+
@@ -56,7 +55,7 @@ diff -ru openjdk.orig/hotspot/make/Makef
# Export file rule
generic_export: $(EXPORT_LIST)
export_product:
-@@ -207,17 +226,24 @@
+@@ -207,11 +226,17 @@
C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
@@ -67,40 +66,63 @@ diff -ru openjdk.orig/hotspot/make/Makef
+CORE_DIR=$(CORE_BASE_DIR)/$(VM_SUBDIR)
-# Misc files and generated files need to come from C1 or C2 area
--ifeq ($(ARCH_DATA_MODEL), 32)
-- MISC_DIR=$(C1_DIR)
-- GEN_DIR=$(C1_BASE_DIR)/generated
+# Misc files and generated files need to come from the correct area
-+ifneq ($(filter ppc ppc64,$(ARCH)),)
++ifdef ICEDTEA_CORE_BUILD
+ MISC_DIR=$(CORE_DIR)
+ GEN_DIR=$(CORE_BASE_DIR)/generated
- else
-- MISC_DIR=$(C2_DIR)
-- GEN_DIR=$(C2_BASE_DIR)/generated
-+ ifeq ($(ARCH_DATA_MODEL), 32)
-+ MISC_DIR=$(C1_DIR)
-+ GEN_DIR=$(C1_BASE_DIR)/generated
-+ else
-+ MISC_DIR=$(C2_DIR)
-+ GEN_DIR=$(C2_BASE_DIR)/generated
-+ endif
- endif
++else
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ MISC_DIR=$(C1_DIR)
+ GEN_DIR=$(C1_BASE_DIR)/generated
+@@ -219,6 +244,7 @@
+ MISC_DIR=$(C2_DIR)
+ GEN_DIR=$(C2_BASE_DIR)/generated
+ endif
++endif
# Bin files (windows)
-@@ -264,8 +290,13 @@
- ifneq ($(OSNAME),windows)
- $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
+ ifeq ($(OSNAME),windows)
+@@ -272,6 +298,10 @@
$(install-file)
-+ifneq ($(filter ppc ppc64,$(ARCH)),)
-+$(EXPORT_CLIENT_DIR)/%.so: $(CORE_DIR)/%.so
+ $(EXPORT_SERVER_DIR)/64/%.so: $(C2_DIR)/%.so
+ $(install-file)
++$(EXPORT_CORE_DIR)/%.so: $(CORE_DIR)/%.so
+ $(install-file)
-+else
- $(EXPORT_CLIENT_DIR)/%.so: $(C1_DIR)/%.so
++$(EXPORT_CORE_DIR)/64/%.so: $(CORE_DIR)/%.so
++ $(install-file)
+ endif
+
+ # Jar file (sa-jdi.jar)
+@@ -296,7 +326,7 @@
$(install-file)
-+endif
- $(EXPORT_CLIENT_DIR)/64/%.so: $(C1_DIR)/%.so
- $(install-file)
- $(EXPORT_SERVER_DIR)/%.so: $(C2_DIR)/%.so
+
+ # Xusage file
+-$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE)
++$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt $(EXPORT_CORE_DIR)/Xusage.txt: $(XUSAGE)
+ $(prep-target)
+ $(RM) $@.temp
+ $(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp
+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
+@@ -93,6 +93,12 @@
+ VM_DEBUG=jvmg
+
+ EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
++ifdef ICEDTEA_CORE_BUILD
++EXPORT_CORE_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/core
++EXPORT_LIST += $(EXPORT_CORE_DIR)/Xusage.txt
++EXPORT_LIST += $(EXPORT_CORE_DIR)/libjsig.so
++EXPORT_LIST += $(EXPORT_CORE_DIR)/libjvm.so
++else
+ EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
+@@ -111,3 +117,4 @@
+ EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
+ endif
+ endif
++endif
diff -ru 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 2007-10-12 08:46:18.000000000 +0100
+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2007-11-08 09:40:57.000000000 +0000
@@ -117,3 +139,196 @@ diff -ru openjdk.orig/hotspot/src/share/
#endif // TIERED
#endif // KERNEL
+diff -ru openjdk.orig/jdk/make/common/shared/Defs-linux.gmk openjdk/jdk/make/common/shared/Defs-linux.gmk
+--- openjdk.orig/jdk/make/common/shared/Defs-linux.gmk 2008-01-31 14:20:37.000000000 +0000
++++ openjdk/jdk/make/common/shared/Defs-linux.gmk 2008-02-04 10:06:07.000000000 +0000
+@@ -177,3 +177,13 @@
+ endif
+ HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH)
+
++# HOTSPOT_CORE_PATH: location of core jvm library file.
++ifdef ICEDTEA_CORE_BUILD
++ ifdef ALT_HOTSPOT_CORE_PATH
++ HOTSPOT_CORE_PATH :=$(call FullPath,$(ALT_HOTSPOT_CORE_PATH))
++ else
++ HOTSPOT_CORE_PATH =$(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/core
++ endif
++ HOTSPOT_CORE_PATH:=$(call AltCheckValue,HOTSPOT_CORE_PATH)
++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
+@@ -40,6 +40,7 @@
+
+ SERVER_LOCATION = server
+ CLIENT_LOCATION = client
++CORE_LOCATION = core
+
+ DB_SUFFIX = _db
+
+@@ -67,8 +68,7 @@
+ INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist
+
+ # List of files coming from outside this workspace
+-IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
+- $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
++IMPORT_LIST =
+
+ # INCLUDE_SA is false on platforms where SA is not supported.
+ # On platforms where it is supported, we want to allow it to
+@@ -94,12 +94,42 @@
+ endif
+ endif # INCLUDE_SA
+
+-# Hotspot client is only available on 32-bit builds
+-ifeq ($(ARCH_DATA_MODEL), 32)
++# Include the client VM on platforms where it is supported.
++INCLUDE_CLIENT := $(shell if [ -r $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME) ]; then \
++ $(ECHO) true; \
++ else \
++ $(ECHO) false; \
++ fi)
++
++ifeq ($(INCLUDE_CLIENT), true)
+ IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \
+ $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt
+ endif
+
++# Include the server VM on platforms where it is supported.
++INCLUDE_SERVER := $(shell if [ -r $(HOTSPOT_SERVER_PATH)/$(JVM_NAME) ]; then \
++ $(ECHO) true; \
++ else \
++ $(ECHO) false; \
++ fi)
++
++ifeq ($(INCLUDE_SERVER), true)
++ IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
++ $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
++endif
++
++# Include the core VM on platforms where it is supported.
++INCLUDE_CORE := $(shell if [ -r $(HOTSPOT_CORE_PATH)/$(JVM_NAME) ]; then \
++ $(ECHO) true; \
++ else \
++ $(ECHO) false; \
++ fi)
++
++ifeq ($(INCLUDE_CORE), true)
++ IMPORT_LIST += $(LIB_LOCATION)/$(CORE_LOCATION)/$(JVM_NAME) \
++ $(LIB_LOCATION)/$(CORE_LOCATION)/Xusage.txt
++endif
++
+ ifeq ($(PLATFORM), windows)
+ # Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows
+
+@@ -119,8 +149,7 @@
+ $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \
+ $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME)
+
+-# Hotspot client is only available on 32-bit builds
+-ifeq ($(ARCH_DATA_MODEL), 32)
++ifeq ($(INCLUDE_CLIENT), true)
+ IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \
+ $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME)
+ endif
+@@ -151,17 +180,25 @@
+ # NOT Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv NOT Windows
+
+ IMPORT_LIST += \
+- $(LIB_LOCATION)/$(LIBJSIG_NAME) \
+- $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME)
++ $(LIB_LOCATION)/$(LIBJSIG_NAME)
+
+ ifeq ($(PLATFORM), solaris)
+ IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
+ endif
+
+-ifeq ($(ARCH_DATA_MODEL), 32)
++ifeq ($(INCLUDE_CLIENT), true)
++ IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
++endif
+
+-IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME)
++ifeq ($(INCLUDE_SERVER), true)
++ IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME)
++endif
++
++ifeq ($(INCLUDE_CORE), true)
++ IMPORT_LIST += $(LIB_LOCATION)/$(CORE_LOCATION)/$(LIBJSIG_NAME)
++endif
+
++ifeq ($(ARCH_DATA_MODEL), 32)
+ ifeq ($(PLATFORM), solaris)
+ # solaris vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv solaris
+
+@@ -195,11 +232,25 @@
+ $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME)
+ $(install-import-file)
+
+-$(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_SERVER_PATH)/$(LIBJSIG_NAME)
++$(LIB_LOCATION)/$(CORE_LOCATION)/$(JVM_NAME): $(HOTSPOT_CORE_PATH)/$(JVM_NAME)
++ $(install-import-file)
++
++ifeq ($(INCLUDE_SERVER), true)
++ LIBJSIG_IMPORT_PATH = $(HOTSPOT_SERVER_PATH)
++else
++ifeq ($(INCLUDE_CLIENT), true)
++ LIBJSIG_IMPORT_PATH = $(HOTSPOT_CLIENT_PATH)
++else
++ LIBJSIG_IMPORT_PATH = $(HOTSPOT_CORE_PATH)
++endif
++endif
++
++$(LIB_LOCATION)/$(LIBJSIG_NAME): $(LIBJSIG_IMPORT_PATH)/$(LIBJSIG_NAME)
+ $(install-import-file)
+
+ $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \
+-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME):
++$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME) \
++$(LIB_LOCATION)/$(CORE_LOCATION)/$(LIBJSIG_NAME):
+ @$(prep-target)
+ $(LN) -s ../$(LIBJSIG_NAME) $@
+
+@@ -224,6 +275,9 @@
+ $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt : $(HOTSPOT_CLIENT_PATH)/Xusage.txt
+ $(install-import-file)
+
++$(LIB_LOCATION)/$(CORE_LOCATION)/Xusage.txt : $(HOTSPOT_CORE_PATH)/Xusage.txt
++ $(install-import-file)
++
+ ifeq ($(INCLUDE_SA), true)
+ # The Serviceability Agent is built in the Hotspot workspace.
+ # It contains two files:
+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,11 @@ endif
+ # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
+ # the library itself should not.
+ #
+-VM_NAME = server
++ifneq ($(wildcard $(LIBDIR)/$(LIBARCH)/server/libjvm.so),)
++ VM_NAME = server
++else
++ VM_NAME = core
++endif
+ 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,11 @@ endif
+ # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
+ # the library itself should not.
+ #
+-VM_NAME = server
++ifneq ($(wildcard $(BOOTDIR)/jre/lib/$(LIBARCH)/server/libjvm.so),)
++ VM_NAME = server
++else
++ VM_NAME = core
++endif
+ JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
+ JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
+
diff -r e1f5ee2e2c0e -r 43edef9724f0 patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch Mon Feb 11 14:25:34 2008 -0500
+++ b/patches/icedtea-ports.patch Wed Feb 13 08:23:39 2008 -0500
@@ -1,20 +1,3 @@ diff -ru openjdk.orig/hotspot/make/Makef
-diff -ru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile 2007-11-21 14:49:24.000000000 +0000
-+++ openjdk/hotspot/make/Makefile 2007-11-21 14:50:04.000000000 +0000
-@@ -167,9 +167,13 @@
- BuildUser=$(USERNAME) \
- $(MAKE_ARGS) $(VM_TARGET)
- else
-+ ifeq ($(filter ppc ppc64,$(ARCH)),)
- $(CD) $(OUTPUTDIR); \
- $(MAKE) -f $(ABS_OS_MAKEFILE) \
- $(MAKE_ARGS) $(VM_TARGET)
-+ else
-+ @$(ECHO) "No compiler2 ($(VM_TARGET)) for ARCH=$(ARCH)"
-+ endif
More information about the distro-pkg-dev
mailing list