changeset in /hg/icedtea6: Allow build with latest HotSpot.
Andrew John Hughes
gnu_andrew at member.fsf.org
Tue Dec 2 09:05:54 PST 2008
changeset 77c54978bab7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=77c54978bab7
description:
Allow build with latest HotSpot.
2008-12-01 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/icedtea-hotspot-params-cast-size_t.patch,
* patches/icedtea-hotspot-use-idx_t.patch,
* patches/icedtea-memory-limits.patch,
* patches/icedtea-sparc-ptracefix.patch,
* patches/icedtea-sparc-trapsfix.patch,
* patches/icedtea-sparc64-linux.patch,
* patches/icedtea-static-libstdc++.patch,
* patches/icedtea-text-relocations.patch:
Removed; replaced by HotSpot-specific versions.
* Makefile.am:
Download a HotSpot version matching a given changeset
and use it in place of the copy of hs10.0b19 shipping
with OpenJDK6. Apply patches based on ${HSBUILD}.
* acinclude.m4: New macros for options --with-hotspot-build
and --with-hotspot-src-zip.
* configure.ac: Run new macros.
* hotspot.map: Map of HotSpot build numbers to changesets.
* patches/icedtea-core-build.patch,
* patches/icedtea-debuginfo.patch:
Remove HotSpot specific parts.
* patches/icedtea-ecj-hotspot-14.0b08.patch,
* patches/icedtea-ecj-hotspot-original.patch:
New HotSpot-specific patches built from IcedTea7
and 6 versions of icedtea-ecj respectively.
* patches/icedtea-ecj.patch,
* patches/icedtea-gcc-4.3.patch,
* patches/icedtea-gcc-suffix.patch,
* patches/icedtea-headers.patch:
Remove HotSpot-specific parts.
* patches/icedtea-hotspot-14.0b08-core-build.patch,
* patches/icedtea-hotspot-14.0b08-debuginfo.patch,
* patches/icedtea-hotspot-14.0b08-gcc-suffix.patch,
* patches/icedtea-hotspot-14.0b08-headers.patch,
* patches/icedtea-hotspot-14.0b08-memory-limits.patch,
* patches/icedtea-hotspot-14.0b08-params-cast-size_t.patch,
* patches/icedtea-hotspot-14.0b08-shark-build.patch,
* patches/icedtea-hotspot-14.0b08-sparc-ptracefix.patch,
* patches/icedtea-hotspot-14.0b08-sparc-trapsfix.patch,
* patches/icedtea-hotspot-14.0b08-sparc64-linux.patch,
* patches/icedtea-hotspot-14.0b08-static-libstdc++.patch,
* patches/icedtea-hotspot-14.0b08-text-relocations.patch,
* patches/icedtea-hotspot-14.0b08-use-idx_t.patch,
* patches/icedtea-hotspot-14.0b08-version.patch,
* patches/icedtea-hotspot-14.0b08-zero-build.patch,
* patches/icedtea-hotspot-original-core-build.patch,
* patches/icedtea-hotspot-original-debuginfo.patch,
* patches/icedtea-hotspot-original-gcc-4.3.patch,
* patches/icedtea-hotspot-original-gcc-suffix.patch,
* patches/icedtea-hotspot-original-headers.patch,
* patches/icedtea-hotspot-original-memory-limits.patch,
* patches/icedtea-hotspot-original-params-cast-size_t.patch,
* patches/icedtea-hotspot-original-shark-build.patch,
* patches/icedtea-hotspot-original-sparc-ptracefix.patch,
* patches/icedtea-hotspot-original-sparc-trapsfix.patch,
* patches/icedtea-hotspot-original-sparc64-linux.patch,
* patches/icedtea-hotspot-original-static-libstdc++.patch,
* patches/icedtea-hotspot-original-text-relocations.patch,
* patches/icedtea-hotspot-original-use-idx_t.patch,
* patches/icedtea-hotspot-original-version.patch,
* patches/icedtea-hotspot-original-zero-build.patch:
New HotSpot-specific patches built from IcedTea7
and 6 versions of the patch respectively.
* patches/icedtea-shark-build.patch,
* patches/icedtea-version.patch,
* patches/icedtea-zero-build.patch:
Remove HotSpot-specific parts.
diffstat:
55 files changed, 2417 insertions(+), 1322 deletions(-)
ChangeLog | 69 +++
Makefile.am | 81 ++-
acinclude.m4 | 39 +
configure.ac | 2
hotspot.map | 1
patches/icedtea-core-build.patch | 114 -----
patches/icedtea-debuginfo.patch | 14
patches/icedtea-ecj-hotspot-14.0b08.patch | 48 ++
patches/icedtea-ecj-hotspot-original.patch | 45 ++
patches/icedtea-ecj.patch | 44 --
patches/icedtea-gcc-4.3.patch | 71 ---
patches/icedtea-gcc-suffix.patch | 24 -
patches/icedtea-headers.patch | 11
patches/icedtea-hotspot-14.0b08-core-build.patch | 108 ++++
patches/icedtea-hotspot-14.0b08-debuginfo.patch | 15
patches/icedtea-hotspot-14.0b08-gcc-suffix.patch | 25 +
patches/icedtea-hotspot-14.0b08-headers.patch | 13
patches/icedtea-hotspot-14.0b08-memory-limits.patch | 23 +
patches/icedtea-hotspot-14.0b08-params-cast-size_t.patch | 121 +++++
patches/icedtea-hotspot-14.0b08-shark-build.patch | 233 ++++++++++
patches/icedtea-hotspot-14.0b08-sparc-ptracefix.patch | 34 +
patches/icedtea-hotspot-14.0b08-sparc-trapsfix.patch | 21
patches/icedtea-hotspot-14.0b08-sparc64-linux.patch | 42 +
patches/icedtea-hotspot-14.0b08-static-libstdc++.patch | 16
patches/icedtea-hotspot-14.0b08-text-relocations.patch | 15
patches/icedtea-hotspot-14.0b08-use-idx_t.patch | 45 ++
patches/icedtea-hotspot-14.0b08-version.patch | 38 +
patches/icedtea-hotspot-14.0b08-zero-build.patch | 129 +++++
patches/icedtea-hotspot-original-core-build.patch | 113 +++++
patches/icedtea-hotspot-original-debuginfo.patch | 15
patches/icedtea-hotspot-original-gcc-4.3.patch | 72 +++
patches/icedtea-hotspot-original-gcc-suffix.patch | 25 +
patches/icedtea-hotspot-original-headers.patch | 12
patches/icedtea-hotspot-original-memory-limits.patch | 21
patches/icedtea-hotspot-original-params-cast-size_t.patch | 121 +++++
patches/icedtea-hotspot-original-shark-build.patch | 232 ++++++++++
patches/icedtea-hotspot-original-sparc-ptracefix.patch | 34 +
patches/icedtea-hotspot-original-sparc-trapsfix.patch | 21
patches/icedtea-hotspot-original-sparc64-linux.patch | 93 ++++
patches/icedtea-hotspot-original-static-libstdc++.patch | 33 +
patches/icedtea-hotspot-original-text-relocations.patch | 25 +
patches/icedtea-hotspot-original-use-idx_t.patch | 282 +++++++++++++
patches/icedtea-hotspot-original-version.patch | 36 +
patches/icedtea-hotspot-original-zero-build.patch | 133 ++++++
patches/icedtea-hotspot-params-cast-size_t.patch | 121 -----
patches/icedtea-hotspot-use-idx_t.patch | 282 -------------
patches/icedtea-memory-limits.patch | 21
patches/icedtea-shark-build.patch | 233 ----------
patches/icedtea-sparc-ptracefix.patch | 34 -
patches/icedtea-sparc-trapsfix.patch | 21
patches/icedtea-sparc64-linux.patch | 93 ----
patches/icedtea-static-libstdc++.patch | 33 -
patches/icedtea-text-relocations.patch | 25 -
patches/icedtea-version.patch | 35 -
patches/icedtea-zero-build.patch | 132 ------
diffs (truncated from 4157 to 500 lines):
diff -r 990fb5e4f060 -r 77c54978bab7 ChangeLog
--- a/ChangeLog Mon Dec 01 00:34:53 2008 +0100
+++ b/ChangeLog Mon Dec 01 17:30:31 2008 +0000
@@ -1,3 +1,72 @@ 2008-11-30 Mark Wielaard <mark at klomp.o
+2008-12-01 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * patches/icedtea-hotspot-params-cast-size_t.patch,
+ * patches/icedtea-hotspot-use-idx_t.patch,
+ * patches/icedtea-memory-limits.patch,
+ * patches/icedtea-sparc-ptracefix.patch,
+ * patches/icedtea-sparc-trapsfix.patch,
+ * patches/icedtea-sparc64-linux.patch,
+ * patches/icedtea-static-libstdc++.patch,
+ * patches/icedtea-text-relocations.patch:
+ Removed; replaced by HotSpot-specific versions.
+ * Makefile.am:
+ Download a HotSpot version matching a given changeset
+ and use it in place of the copy of hs10.0b19 shipping
+ with OpenJDK6. Apply patches based on ${HSBUILD}.
+ * acinclude.m4: New macros for options --with-hotspot-build
+ and --with-hotspot-src-zip.
+ * configure.ac: Run new macros.
+ * hotspot.map: Map of HotSpot build numbers to changesets.
+ * patches/icedtea-core-build.patch,
+ * patches/icedtea-debuginfo.patch:
+ Remove HotSpot specific parts.
+ * patches/icedtea-ecj-hotspot-14.0b08.patch,
+ * patches/icedtea-ecj-hotspot-original.patch:
+ New HotSpot-specific patches built from IcedTea7
+ and 6 versions of icedtea-ecj respectively.
+ * patches/icedtea-ecj.patch,
+ * patches/icedtea-gcc-4.3.patch,
+ * patches/icedtea-gcc-suffix.patch,
+ * patches/icedtea-headers.patch:
+ Remove HotSpot-specific parts.
+ * patches/icedtea-hotspot-14.0b08-core-build.patch,
+ * patches/icedtea-hotspot-14.0b08-debuginfo.patch,
+ * patches/icedtea-hotspot-14.0b08-gcc-suffix.patch,
+ * patches/icedtea-hotspot-14.0b08-headers.patch,
+ * patches/icedtea-hotspot-14.0b08-memory-limits.patch,
+ * patches/icedtea-hotspot-14.0b08-params-cast-size_t.patch,
+ * patches/icedtea-hotspot-14.0b08-shark-build.patch,
+ * patches/icedtea-hotspot-14.0b08-sparc-ptracefix.patch,
+ * patches/icedtea-hotspot-14.0b08-sparc-trapsfix.patch,
+ * patches/icedtea-hotspot-14.0b08-sparc64-linux.patch,
+ * patches/icedtea-hotspot-14.0b08-static-libstdc++.patch,
+ * patches/icedtea-hotspot-14.0b08-text-relocations.patch,
+ * patches/icedtea-hotspot-14.0b08-use-idx_t.patch,
+ * patches/icedtea-hotspot-14.0b08-version.patch,
+ * patches/icedtea-hotspot-14.0b08-zero-build.patch,
+ * patches/icedtea-hotspot-original-core-build.patch,
+ * patches/icedtea-hotspot-original-debuginfo.patch,
+ * patches/icedtea-hotspot-original-gcc-4.3.patch,
+ * patches/icedtea-hotspot-original-gcc-suffix.patch,
+ * patches/icedtea-hotspot-original-headers.patch,
+ * patches/icedtea-hotspot-original-memory-limits.patch,
+ * patches/icedtea-hotspot-original-params-cast-size_t.patch,
+ * patches/icedtea-hotspot-original-shark-build.patch,
+ * patches/icedtea-hotspot-original-sparc-ptracefix.patch,
+ * patches/icedtea-hotspot-original-sparc-trapsfix.patch,
+ * patches/icedtea-hotspot-original-sparc64-linux.patch,
+ * patches/icedtea-hotspot-original-static-libstdc++.patch,
+ * patches/icedtea-hotspot-original-text-relocations.patch,
+ * patches/icedtea-hotspot-original-use-idx_t.patch,
+ * patches/icedtea-hotspot-original-version.patch,
+ * patches/icedtea-hotspot-original-zero-build.patch:
+ New HotSpot-specific patches built from IcedTea7
+ and 6 versions of the patch respectively.
+ * patches/icedtea-shark-build.patch,
+ * patches/icedtea-version.patch,
+ * patches/icedtea-zero-build.patch:
+ Remove HotSpot-specific parts.
+
2008-11-30 Mark Wielaard <mark at klomp.org>
* patches/icedtea-xrender-001.patch: Remove !xrender bug fix.
diff -r 990fb5e4f060 -r 77c54978bab7 Makefile.am
--- a/Makefile.am Mon Dec 01 00:34:53 2008 +0100
+++ b/Makefile.am Mon Dec 01 17:30:31 2008 +0000
@@ -45,6 +45,12 @@ VISUALVM_PATCH = patches/icedtea-visualv
VISUALVM_PATCH = patches/icedtea-visualvm.patch
else
VISUALVM_PATCH =
+endif
+
+if WITH_ALT_HSBUILD
+HOTSPOT_MAKE_DIR = make
+else
+HOTSPOT_MAKE_DIR = build
endif
# Top-Level Targets
@@ -281,11 +287,18 @@ snapshot: dist
# Download OpenJDK sources.
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
+HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/
if USE_ALT_OPENJDK_SRC_ZIP
OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
else
OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
+endif
+
+if USE_ALT_HOTSPOT_SRC_ZIP
+ HOTSPOT_SRC_ZIP = $(ALT_HOTSPOT_SRC_ZIP)
+else
+ HOTSPOT_SRC_ZIP = hotspot.tar.gz
endif
CACAO_BASE_URL = http://www.complang.tuwien.ac.at
@@ -333,6 +346,13 @@ else
fi ; \
$(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
fi
+endif
+if WITH_ALT_HSBUILD
+if USE_ALT_HOTSPOT_SRC_ZIP
+else
+ changeset="`cat $(abs_top_srcdir)/hotspot.map|grep $(HSBUILD)|cut -f2`"; \
+ $(WGET) $(HOTSPOT_URL)$${changeset}.tar.gz -O $(HOTSPOT_SRC_ZIP);
+endif
endif
if WITH_CACAO
if !USE_SYSTEM_CACAO
@@ -407,13 +427,13 @@ endif
# Link ports sources into tree
stamps/ports.stamp: stamps/extract.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ for target in $(abs_top_srcdir)/ports/hotspot/$(HOTSPOT_MAKE_DIR)/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
$(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
ln -sf $$target $$link; \
done
- ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
+ ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/$(HOTSPOT_MAKE_DIR)/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
= "xno" ; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR) ; \
@@ -431,7 +451,8 @@ if GCC_OLD
if GCC_OLD
GCC_PATCH =
else
- GCC_PATCH = patches/icedtea-gcc-4.3.patch
+ GCC_PATCH = patches/icedtea-gcc-4.3.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-gcc-4.3.patch
endif
# If ZERO_BUILD is set then we are building zero and need
@@ -458,7 +479,11 @@ if ZERO_BUILD
if ZERO_BUILD
ZERO_PATCHES_COND = $(ZERO_PATCHES)
else
+if WITH_ALT_HSBUILD
+ ZERO_PATCHES_COND =
+else
ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
+endif
endif
# If Shark is required, apply shark patch
@@ -472,12 +497,13 @@ ICEDTEA_FSG_PATCHES =
ICEDTEA_PATCHES = \
$(ZERO_PATCHES_COND) \
- patches/icedtea-hotspot7-tests.patch \
+ patches/icedtea-version.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-version.patch \
patches/icedtea-copy-plugs.patch \
- patches/icedtea-version.patch \
- patches/icedtea-text-relocations.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-text-relocations.patch \
patches/icedtea-graphics.patch \
patches/icedtea-debuginfo.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-debuginfo.patch \
patches/icedtea-ssl.patch \
$(PLUGIN_PATCH) \
patches/icedtea-webstart.patch \
@@ -487,32 +513,36 @@ ICEDTEA_PATCHES = \
patches/icedtea-demos.patch \
patches/icedtea-use-system-tzdata.patch \
patches/icedtea-headers.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-headers.patch \
patches/icedtea-ant.patch \
patches/icedtea-gcc-suffix.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-gcc-suffix.patch \
patches/icedtea-bytebuffer-compact.patch \
patches/icedtea-float-double-trailing-zeros.patch \
- patches/icedtea-memory-limits.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-memory-limits.patch \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
patches/icedtea-core-build.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-core-build.patch \
patches/icedtea-linker-options.patch \
- patches/icedtea-static-libstdc++.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-static-libstdc++.patch \
patches/icedtea-timerqueue.patch \
patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
patches/icedtea-uname.patch \
patches/icedtea-ia64-fdlibm.patch \
patches/icedtea-fonts.patch \
- patches/icedtea-sparc.patch \
- patches/icedtea-sparc64-linux.patch \
- patches/icedtea-sparc-ptracefix.patch \
- patches/icedtea-sparc-trapsfix.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-sparc64-linux.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-sparc-ptracefix.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
patches/icedtea-no-bcopy.patch \
patches/icedtea-shark-build.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-shark-build.patch \
patches/icedtea-toolkit.patch \
patches/icedtea-jdk-docs-target.patch \
patches/icedtea-nomotif-6706121.patch \
@@ -521,8 +551,8 @@ ICEDTEA_PATCHES = \
patches/icedtea-alt-jar.patch \
patches/icedtea-enum-bug-181.patch \
patches/icedtea-jdk-use-ssize_t.patch \
- patches/icedtea-hotspot-use-idx_t.patch \
- patches/icedtea-hotspot-params-cast-size_t.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-use-idx_t.patch \
+ patches/icedtea-hotspot-$(HSBUILD)-params-cast-size_t.patch \
patches/icedtea-clean-crypto.patch \
$(SHARK_PATCH) \
$(GCC_PATCH) \
@@ -544,6 +574,12 @@ ICEDTEA_PATCHES = \
patches/icedtea-samejvm-safe.patch \
patches/icedtea-6728542-epoll.patch
+if !WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += \
+ patches/icedtea-hotspot7-tests.patch \
+ patches/icedtea-sparc.patch
+endif
+
if WITH_RHINO
ICEDTEA_PATCHES += \
patches/icedtea-rhino.patch
@@ -575,6 +611,13 @@ stamps/extract.stamp: stamps/download.st
mkdir openjdk ; \
$(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
chmod -R ug+w openjdk ; \
+ if test -e ${HOTSPOT_SRC_ZIP} ; \
+ then \
+ rm -rf openjdk/hotspot ; \
+ $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \
+ chmod -R ug+w hotspot-* ; \
+ mv hotspot-* openjdk/hotspot ; \
+ fi ; \
sh $(abs_top_srcdir)/fsg.sh ; \
fi
if WITH_CACAO
@@ -759,13 +802,13 @@ clean-extract-ecj:
# Link ports sources into tree
stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+ for target in $(abs_top_srcdir)/ports/hotspot/$(HOTSPOT_MAKE_DIR)/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
$(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
ln -sf $$target $$link; \
done
- ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
+ ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/$(HOTSPOT_MAKE_DIR)/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
= "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
@@ -781,6 +824,7 @@ stamps/ports-ecj.stamp: stamps/extract-e
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCHES = patches/icedtea-ecj.patch \
+ patches/icedtea-ecj-hotspot-$(HSBUILD).patch \
patches/icedtea-ecj-spp.patch \
patches/icedtea-ecj-jopt.patch \
patches/icedtea-ecj-pr261.patch
@@ -1206,6 +1250,11 @@ ICEDTEA_COPY_DIRS = \
java/rmi \
sun/awt/ \
javax/net/ssl
+
+if WITH_ALT_HSBUILD
+ICEDTEA_COPY_DIRS += \
+ javax/script
+endif
stamps/copy-source-files.stamp: stamps/patch.stamp
for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
diff -r 990fb5e4f060 -r 77c54978bab7 acinclude.m4
--- a/acinclude.m4 Mon Dec 01 00:34:53 2008 +0100
+++ b/acinclude.m4 Mon Dec 01 17:30:31 2008 +0000
@@ -923,3 +923,42 @@ AC_DEFUN([AC_CHECK_WITH_GCJ],
fi
AC_SUBST([GCJ])
])
+
+AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
+[
+ DEFAULT_BUILD="14.0b08"
+ AC_MSG_CHECKING([which HotSpot build to use])
+ AC_ARG_WITH([hotspot-build],
+ [AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use)],
+ [
+ HSBUILD="${withval}"
+ ],
+ [
+ HSBUILD="${DEFAULT_BUILD}"
+ ])
+ if test "x${HSBUILD}" = xyes; then
+ HSBUILD="${DEFAULT_BUILD}"
+ elif test "x${HSBUILD}" = xno; then
+ HSBUILD="original"
+ fi
+ AC_MSG_RESULT([${HSBUILD}])
+ AC_SUBST([HSBUILD])
+ AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "xoriginal")
+])
+
+AC_DEFUN([WITH_HOTSPOT_SRC_ZIP],
+[
+ AC_MSG_CHECKING(for a HotSpot source zip)
+ AC_ARG_WITH([hotspot-src-zip],
+ [AS_HELP_STRING(--with-hotspot-src-zip,specify the location of the hotspot source zip)],
+ [
+ ALT_HOTSPOT_SRC_ZIP=${withval}
+ AM_CONDITIONAL(USE_ALT_HOTSPOT_SRC_ZIP, test x = x)
+ ],
+ [
+ ALT_HOTSPOT_SRC_ZIP="not specified"
+ AM_CONDITIONAL(USE_ALT_HOTSPOT_SRC_ZIP, test x != x)
+ ])
+ AC_MSG_RESULT(${ALT_HOTSPOT_SRC_ZIP})
+ AC_SUBST(ALT_HOTSPOT_SRC_ZIP)
+])
diff -r 990fb5e4f060 -r 77c54978bab7 configure.ac
--- a/configure.ac Mon Dec 01 00:34:53 2008 +0100
+++ b/configure.ac Mon Dec 01 17:30:31 2008 +0000
@@ -33,6 +33,7 @@ AC_SUBST([HG])
AC_SUBST([HG])
AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
AC_CHECK_WITH_GCJ
+AC_CHECK_WITH_HOTSPOT_BUILD
AC_MSG_CHECKING([for a JDK home directory])
AC_ARG_WITH([gcj-home],
@@ -300,6 +301,7 @@ fi
fi
FIND_RHINO_JAR
WITH_OPENJDK_SRC_ZIP
+WITH_HOTSPOT_SRC_ZIP
WITH_OPENJDK_SRC_DIR
WITH_VISUALVM_SRC_ZIP
WITH_NETBEANS_PROFILER_SRC_ZIP
diff -r 990fb5e4f060 -r 77c54978bab7 hotspot.map
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot.map Mon Dec 01 17:30:31 2008 +0000
@@ -0,0 +1,1 @@
+14.0b08 f9d938ede196
diff -r 990fb5e4f060 -r 77c54978bab7 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch Mon Dec 01 00:34:53 2008 +0100
+++ b/patches/icedtea-core-build.patch Mon Dec 01 17:30:31 2008 +0000
@@ -12,22 +12,6 @@ diff -ru openjdk.orig/control/make/make/
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
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-+ifndef ICEDTEA_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 @@ else
- 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
@@ -94,100 +78,4 @@ diff -ru openjdk.orig/corba/make/common/
JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
-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
- 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
- endif
-+endif
-
- # Bin files (windows)
- ifeq ($(OSNAME),windows)
-@@ -264,6 +292,7 @@ endif
-
- # Xusage file
- $(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt: $(XUSAGE)
-+$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE)
- $(prep-target)
- $(RM) $@.temp
- $(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp
-diff -r 79d639c8a75f openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-12 04:14:24.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-14 17:39:45.000000000 -0500
-@@ -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
+
diff -r 990fb5e4f060 -r 77c54978bab7 patches/icedtea-debuginfo.patch
--- a/patches/icedtea-debuginfo.patch Mon Dec 01 00:34:53 2008 +0100
+++ b/patches/icedtea-debuginfo.patch Mon Dec 01 17:30:31 2008 +0000
@@ -1,17 +1,3 @@ diff -urN openjdk.orig/hotspot/build/lin
-diff -urN openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
More information about the distro-pkg-dev
mailing list