IcedTea7 Zero/Shark build patch, take 2
Gary Benson
gbenson at redhat.com
Tue Nov 17 03:44:51 PST 2009
Hi all,
Given that my previous patch turned out to be not such a good idea,
how about this one? It removes the core build stuff, which isn't
required for upstream Zero and was causing some files (jvm.cfg and
ergo_$arch.c) to be created that are now handled upstream. It also
removes a patch that seems to have been left behind from somewhere.
Ok to commit?
Cheers,
Gary
--
http://gbenson.net/
-------------- next part --------------
diff -r 766972166cea Makefile.am
--- a/Makefile.am Tue Nov 17 04:35:14 2009 +0000
+++ b/Makefile.am Tue Nov 17 11:35:37 2009 +0000
@@ -427,11 +427,6 @@
endif
# OpenJDK build environment.
-if CORE_BUILD
- ICEDTEA_CORE_BUILD = true
-else
- ICEDTEA_CORE_BUILD =
-endif
if ZERO_BUILD
ICEDTEA_ZERO_BUILD = true
else
@@ -462,7 +457,6 @@
ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
CLASSPATH="" \
LD_LIBRARY_PATH="" \
- CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
ZERO_LIBARCH="$(ZERO_LIBARCH)" \
@@ -1315,13 +1309,12 @@
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/make#"); \
ln -sfv $$target $$link; \
done
- if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
- = "xno" ; then \
+ if ! test "x$(WITH_CACAO)" = "xno" ; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR) ; \
ln -sf $(abs_top_builddir)/jvm.cfg \
openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg ; \
fi
- if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
+ if ! test "x$(WITH_CACAO)" = "xno"; then \
ln -sf $(abs_top_builddir)/ergo.c \
openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
diff -r 766972166cea acinclude.m4
--- a/acinclude.m4 Tue Nov 17 04:35:14 2009 +0000
+++ b/acinclude.m4 Tue Nov 17 11:35:37 2009 +0000
@@ -718,16 +718,6 @@
AC_MSG_RESULT($use_zero)
AM_CONDITIONAL(ZERO_BUILD, test "x${use_zero}" = xyes)
- use_core=no
- if test "x${WITH_CACAO}" != "xno"; then
- use_core=yes;
- elif test "x${use_zero}" = "xyes"; then
- if test "x${use_shark}" = "xno"; then
- use_core=yes;
- fi
- fi
- AM_CONDITIONAL(CORE_BUILD, test "x${use_core}" = xyes)
-
ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
dnl can't use AC_CHECK_SIZEOF on multilib
case "${ZERO_LIBARCH}" in
diff -r 766972166cea patches/hotspot/default/icedtea-core-zero-build.patch
--- a/patches/hotspot/default/icedtea-core-zero-build.patch Tue Nov 17 04:35:14 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
---- openjdk/hotspot/make/Makefile.orig 2008-11-25 09:11:57.000000000 +0000
-+++ openjdk/hotspot/make/Makefile 2008-12-05 16:54:54.000000000 +0000
-@@ -91,6 +91,15 @@
- all_debug: jvmg jvmg1 jvmgkernel docs export_debug
- all_optimized: optimized optimized1 optimizedkernel 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
-
-@@ -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
-
-+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 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)
-
- # Misc files and generated files need to come from C1 or C2 area
-+ifdef 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
-
- # Bin files (windows)
- ifeq ($(OSNAME),windows)
---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig 2008-12-05 16:54:13.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-12-05 16:54:54.000000000 +0000
-@@ -89,8 +89,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
-
- #ifndef HOTSPOT_VM_DISTRO
---- openjdk/hotspot/build/linux/makefiles/defs.make.orig 2008-11-25 09:11:51.000000000 +0000
-+++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-12-05 16:54:54.000000000 +0000
-@@ -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
-+ifndef CORE_BUILD
- 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 @@
- EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
- endif
- endif
-+endif
More information about the distro-pkg-dev
mailing list