/hg/icedtea: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri May 30 21:32:01 UTC 2014
changeset d8f74d379cf5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d8f74d379cf5
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon May 12 20:17:41 2014 +0100
Use 02 (for u2) as the update version.
2012-10-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Move JDK_UPDATE_VERSION and COMBINED_VERSION
to top of file with OPENJDK_VERSION.
(JDK_UPDATE_VERSION): Set to 02 for u2.
changeset 3d2a25b6d167 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3d2a25b6d167
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri May 30 19:59:09 2014 +0100
PR1796: make fails with "computed checksum did NOT match"
2014-05-29 Andrew John Hughes <ahughes at redhat.com>
* patches/alt-jar.patch,
* patches/cacao/arch.patch,
* patches/debian/uname.patch:
Applied to upstream IcedTea forest.
* patches/pr1368-debug_jdk_libs.patch,
* patches/pr1368-debug_jdk_programs.patch:
Applied to upstream OpenJDK.
* patches/rhino.patch:
Rhino has been removed.
* INSTALL: Mention --with-nashorn-src-zip.
* Makefile.am:
(OPENJDK_VERSION): Bump to b10.
(JDK_UPDATE_VERSION): Bump to 20.
(CORBA_CHANGESET): Update to 3.0.0pre01 .
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(NASHORN_CHANGESET): Added & likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(NASHORN_SHA256SUM): Added & likewise.
(OPENJDK_URL): Switch back to IcedTea.
(CORBA_URL): Likewise.
(JAXP_URL): Likewise.
(JAXWS_URL): Likewise.
(JDK_URL): Likewise.
(LANGTOOLS_URL): Likewise.
(HOTSPOT_URL): Likewise.
(NASHORN_URL): Added.
(VERSION_SETTINGS_FILE): Store path of file
needed to store version variable settings.
(NASHORN_SRC_ZIP): Added.
(ICEDTEA_PATCHES): Drop upstreamed & removed
patches.
(.PHONY): Add clean-download-nashorn and
clean-extract-nashorn.
(download): Depend on download-nashorn.
(clean-download): Depend on clean-download-nashorn.
(download-nashorn): Download the Nashorn source
zip if necessary.
(clean-download-nashorn): Cleanup for download-nashorn.
(extract): Depend on extract-nashorn.
(extract-nashorn); Extract the Nashorn source zip if
necessary.
(clean-extract-nashorn): Cleanup for extract-nashorn.
(versioning): Replace hardcoded path with VERSION_SETTINGS_FILE.
* NEWS: Updated.
* acinclude.m4:
(IT_WITH_NASHORN_SRC_ZIP): New macro to allow Nashorn
source file to be set.
* configure.ac:
Bump version to 3.0.0pre01. Invoke IT_WITH_NASHORN_SRC_ZIP.
* hotspot.map:
Bump to 3.0.0pre01.
* patches/memory-limits.patch,
* patches/nss-config.patch,
* patches/nss-not-enabled-config.patch:
Regenerated.
changeset 8543b35292bb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8543b35292bb
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri May 30 22:31:03 2014 +0100
PR1806: Support Debian/Ubuntu 7 & 8 OpenJDK Installs as Boot JDK
2014-05-30 Andrew John Hughes <ahughes at redhat.com>
PR1806: Support Debian/Ubuntu 7 & 8 OpenJDK
Installs as Boot JDK
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_JDK): Add java-7-openjdk
and java-8-openjdk to ICEDTEA7_VMS and
ICEDTEA8_VMS respectively.
diffstat:
ChangeLog | 84 +++++
INSTALL | 1 +
Makefile.am | 148 ++++++---
NEWS | 17 +
acinclude.m4 | 25 +-
configure.ac | 3 +-
hotspot.map | 2 +-
patches/alt-jar.patch | 15 -
patches/cacao/arch.patch | 87 ------
patches/debian/uname.patch | 26 -
patches/memory-limits.patch | 8 +-
patches/nss-config.patch | 17 +-
patches/nss-not-enabled-config.patch | 8 +-
patches/pr1368-debug_jdk_libs.patch | 460 --------------------------------
patches/pr1368-debug_jdk_programs.patch | 43 --
patches/rhino.patch | 157 ----------
16 files changed, 244 insertions(+), 857 deletions(-)
diffs (truncated from 1341 to 500 lines):
diff -r 24d0bdd59f32 -r 8543b35292bb ChangeLog
--- a/ChangeLog Fri Apr 18 20:41:34 2014 +0100
+++ b/ChangeLog Fri May 30 22:31:03 2014 +0100
@@ -1,3 +1,87 @@
+2014-05-30 Andrew John Hughes <ahughes at redhat.com>
+
+ PR1806: Support Debian/Ubuntu 7 & 8 OpenJDK
+ Installs as Boot JDK
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_JDK): Add java-7-openjdk
+ and java-8-openjdk to ICEDTEA7_VMS and
+ ICEDTEA8_VMS respectively.
+
+2014-05-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/alt-jar.patch,
+ * patches/cacao/arch.patch,
+ * patches/debian/uname.patch:
+ Applied to upstream IcedTea forest.
+ * patches/pr1368-debug_jdk_libs.patch,
+ * patches/pr1368-debug_jdk_programs.patch:
+ Applied to upstream OpenJDK.
+ * patches/rhino.patch:
+ Rhino has been removed.
+ * INSTALL: Mention --with-nashorn-src-zip.
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to b10.
+ (JDK_UPDATE_VERSION): Bump to 20.
+ (CORBA_CHANGESET): Update to 3.0.0pre01 .
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (NASHORN_CHANGESET): Added & likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (NASHORN_SHA256SUM): Added & likewise.
+ (OPENJDK_URL): Switch back to IcedTea.
+ (CORBA_URL): Likewise.
+ (JAXP_URL): Likewise.
+ (JAXWS_URL): Likewise.
+ (JDK_URL): Likewise.
+ (LANGTOOLS_URL): Likewise.
+ (HOTSPOT_URL): Likewise.
+ (NASHORN_URL): Added.
+ (VERSION_SETTINGS_FILE): Store path of file
+ needed to store version variable settings.
+ (NASHORN_SRC_ZIP): Added.
+ (ICEDTEA_PATCHES): Drop upstreamed & removed
+ patches.
+ (.PHONY): Add clean-download-nashorn and
+ clean-extract-nashorn.
+ (download): Depend on download-nashorn.
+ (clean-download): Depend on clean-download-nashorn.
+ (download-nashorn): Download the Nashorn source
+ zip if necessary.
+ (clean-download-nashorn): Cleanup for download-nashorn.
+ (extract): Depend on extract-nashorn.
+ (extract-nashorn); Extract the Nashorn source zip if
+ necessary.
+ (clean-extract-nashorn): Cleanup for extract-nashorn.
+ (versioning): Replace hardcoded path with VERSION_SETTINGS_FILE.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_WITH_NASHORN_SRC_ZIP): New macro to allow Nashorn
+ source file to be set.
+ * configure.ac:
+ Bump version to 3.0.0pre01. Invoke IT_WITH_NASHORN_SRC_ZIP.
+ * hotspot.map:
+ Bump to 3.0.0pre01.
+ * patches/memory-limits.patch,
+ * patches/nss-config.patch,
+ * patches/nss-not-enabled-config.patch:
+ Regenerated.
+
+2012-10-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Move JDK_UPDATE_VERSION and COMBINED_VERSION
+ to top of file with OPENJDK_VERSION.
+ (JDK_UPDATE_VERSION): Set to 02 for u2.
+
2014-04-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS:
diff -r 24d0bdd59f32 -r 8543b35292bb INSTALL
--- a/INSTALL Fri Apr 18 20:41:34 2014 +0100
+++ b/INSTALL Fri May 30 22:31:03 2014 +0100
@@ -151,6 +151,7 @@
* --with-jaxws-src-zip: Specify the location of the JAXWS tarball to avoid downloading.
* --with-jdk-src-zip: Specify the location of the JDK tarball to avoid downloading.
* --with-langtools-src-zip: Specify the location of the langtools tarball to avoid downloading.
+* --with-nashorn-src-zip: Specify the location of the Nashorn tarball to avoid downloading.
* --with-alt-jar: Use the specified jar binary in the second stage rather than the one just built.
* --with-jaxp-drop-zip: Specify the location of the JAXP source drop zip file to avoid downloading.
* --with-jaf-drop-zip: Specify the location of the JAF source drop zip file to avoid downloading.
diff -r 24d0bdd59f32 -r 8543b35292bb Makefile.am
--- a/Makefile.am Fri Apr 18 20:41:34 2014 +0100
+++ b/Makefile.am Fri May 30 22:31:03 2014 +0100
@@ -1,20 +1,24 @@
# Dependencies
-OPENJDK_VERSION = b80
+OPENJDK_VERSION = b10
+JDK_UPDATE_VERSION = 20
+COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 2a00aeeb466b
-JAXP_CHANGESET = ef3495555a4c
-JAXWS_CHANGESET = c88bb21560cc
-JDK_CHANGESET = 758db1c4c65c
-LANGTOOLS_CHANGESET = ed69d087fdfd
-OPENJDK_CHANGESET = cd7f2c7e2a0e
+CORBA_CHANGESET = a96c01f523be
+JAXP_CHANGESET = e16be40cfc32
+JAXWS_CHANGESET = 806fa0e68d92
+JDK_CHANGESET = dc14d13daa5e
+LANGTOOLS_CHANGESET = dd7b57ab4ab1
+OPENJDK_CHANGESET = e0a10e6be00a
+NASHORN_CHANGESET = fdcdffd5b5b1
-CORBA_SHA256SUM = fd30dec3d15ad284365facb0a9195188c95033e908c8c247d137046fc501b2df
-JAXP_SHA256SUM = f7f5ee6e725499bc0b2944182d6b206a661d1da271ab2dff59c282550d89e6e4
-JAXWS_SHA256SUM = b8e27c4fe7214c0c916f554b91a6f1ecff522c7b76b06be1abaf71a835bbca37
-JDK_SHA256SUM = a0918d63bdc9da8461dbb47b0135a8ce522ca943bb2a88558cbf0a63c75a506a
-LANGTOOLS_SHA256SUM = b2f3407fbcc539d61bd6d4830b7e97cc53e5175fea262d6543610fccb3f7c0f3
-OPENJDK_SHA256SUM = b02a1a2ac30e8611e9110e03ea6705a80c21c286411118be5300cab7a65eb651
+CORBA_SHA256SUM = 1ce659773584949b01ecdbc897099352aea4fa2ac40b7a55ff64f4b68e12ffc9
+JAXP_SHA256SUM = c2422395c291cfdf8fce7e87c7a45226ba4c64fd73d614675659f21a7c82b902
+JAXWS_SHA256SUM = 4364b4ddf7031b1b4a17fdd11d0e642203e0e66242a2c4d2ba02fc5587d2711d
+JDK_SHA256SUM = 7db207899441a22daeef26620930ec76653c0860fcb6fc288f9547ae436fdc83
+LANGTOOLS_SHA256SUM = 1aa3b505f3fbb3cc01d480dae0196c7038982bd29ae2df84ad14d587d29976cc
+OPENJDK_SHA256SUM = c8f540a9eccec00df2fa0d93595fdb8eab6384ad3d0579095928aed1591c7a39
+NASHORN_SHA256SUM = fb245c9a4a47b68aece3c4f0cac6fc8ac91c8458bb91648b9a8e3d95ed3981ea
HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
@@ -41,13 +45,14 @@
BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port
NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/
-OPENJDK_URL = $(OPENJDK_HG_URL)
-CORBA_URL = $(OPENJDK_HG_URL)/corba
-JAXP_URL = $(OPENJDK_HG_URL)/jaxp
-JAXWS_URL = $(OPENJDK_HG_URL)/jaxws
-JDK_URL = $(OPENJDK_HG_URL)/jdk
-LANGTOOLS_URL = $(OPENJDK_HG_URL)/langtools
-HOTSPOT_URL = $(OPENJDK_HG_URL)/hotspot
+OPENJDK_URL = $(ICEDTEA_HG_URL)
+CORBA_URL = $(ICEDTEA_HG_URL)/corba
+JAXP_URL = $(ICEDTEA_HG_URL)/jaxp
+JAXWS_URL = $(ICEDTEA_HG_URL)/jaxws
+JDK_URL = $(ICEDTEA_HG_URL)/jdk
+LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools
+HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot
+NASHORN_URL = $(ICEDTEA_HG_URL)/nashorn
# Build directories
@@ -92,6 +97,8 @@
SOURCEPATH_DIRS = $(OPENJDK_SOURCEPATH_DIRS)
+VERSION_SETTINGS_FILE = openjdk/jdk/make/ProfileNames.gmk
+
# Sources used from OpenJDK.
#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement
#PR48033 - Missing javax.management.remote.JMXServiceURL
@@ -120,6 +127,7 @@
JDK_SRC_ZIP =
LANGTOOLS_SRC_ZIP =
HOTSPOT_SRC_ZIP =
+ NASHORN_SRC_ZIP =
else
OPENJDK_SRC_ZIP = openjdk.tar.gz
CORBA_SRC_ZIP = corba.tar.gz
@@ -128,6 +136,7 @@
JDK_SRC_ZIP = jdk.tar.gz
LANGTOOLS_SRC_ZIP = langtools.tar.gz
HOTSPOT_SRC_ZIP = hotspot.tar.gz
+ NASHORN_SRC_ZIP = nashorn.tar.gz
endif
if ENABLE_PULSE_JAVA
@@ -211,21 +220,10 @@
ICEDTEA_PATCHES = \
patches/memory-limits.patch \
- patches/debian/uname.patch \
- patches/override-redirect-metacity.patch \
- patches/alt-jar.patch \
- patches/cacao/arch.patch \
- patches/disable-intree-ec.patch \
- patches/pr1368-debug_jdk_libs.patch \
- patches/pr1368-debug_jdk_programs.patch
+ patches/override-redirect-metacity.patch
# Conditional patches
-if WITH_RHINO
-ICEDTEA_PATCHES += \
- patches/rhino.patch
-endif
-
if BUILD_CACAO
ICEDTEA_PATCHES += \
patches/cacao/launcher.patch \
@@ -269,9 +267,6 @@
ICEDTEA_SHARK_BUILD = true
endif
-JDK_UPDATE_VERSION = $(shell echo $(OPENJDK_VERSION) | sed -e "s/^b//")
-COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-
ICEDTEA_NAME = IcedTea
if HAS_ICEDTEA_REVISION
ICEDTEA_REV = +${ICEDTEA_REVISION}
@@ -539,7 +534,8 @@
clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \
jtregcheck clean-remove-intree-libraries \
clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
- clean-extract-hotspot clean-sanitise-openjdk clean-icedtea-debug
+ clean-extract-hotspot clean-sanitise-openjdk clean-icedtea-debug \
+ clean-download-nashorn clean-extract-nashorn
env:
@echo 'unset JAVA_HOME'
@@ -584,11 +580,12 @@
# Download OpenJDK sources.
-stamps/download.stamp: stamps/download-openjdk.stamp stamps/download-cacao.stamp stamps/download-jamvm.stamp
+stamps/download.stamp: stamps/download-openjdk.stamp stamps/download-cacao.stamp stamps/download-jamvm.stamp \
+ stamps/download-nashorn.stamp
mkdir -p stamps
touch $@
-clean-download: clean-download-openjdk clean-download-cacao clean-download-jamvm
+clean-download: clean-download-openjdk clean-download-cacao clean-download-jamvm clean-download-nashorn
rm -f stamps/download.stamp
stamps/download-openjdk.stamp: stamps/hgforest.stamp
@@ -819,10 +816,39 @@
rm -f $(JAMVM_SRC_ZIP)
rm -f stamps/download-jamvm.stamp
+stamps/download-nashorn.stamp:
+if !OPENJDK_SRC_DIR_FOUND
+if USE_ALT_NASHORN_SRC_ZIP
+ ln -sf $(ALT_NASHORN_SRC_ZIP) $(NASHORN_SRC_ZIP)
+else
+ if ! echo "$(NASHORN_SHA256SUM) $(NASHORN_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; \
+ then \
+ if [ $(NASHORN_SRC_ZIP) ] ; \
+ then \
+ mv $(NASHORN_SRC_ZIP) $(NASHORN_SRC_ZIP).old ; \
+ fi ; \
+ $(WGET) $(NASHORN_URL)/archive/$(NASHORN_CHANGESET).tar.gz -O $(NASHORN_SRC_ZIP); \
+ if ! echo "$(NASHORN_SHA256SUM) $(NASHORN_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; \
+ then echo "ERROR: Bad download of NASHORN zip"; false; \
+ fi; \
+ fi ;
+endif
+endif
+ mkdir -p stamps
+ touch $@
+
+clean-download-nashorn:
+ if [ ! -z $(NASHORN_SRC_ZIP) ] ; then \
+ rm -f $(NASHORN_SRC_ZIP) ; \
+ fi
+ rm -f stamps/download-nashorn.stamp
+
stamps/extract.stamp: stamps/extract-openjdk.stamp \
stamps/extract-cacao.stamp stamps/remove-intree-libraries.stamp \
stamps/extract-jamvm.stamp stamps/extract-hotspot.stamp \
- stamps/sanitise-openjdk.stamp
+ stamps/sanitise-openjdk.stamp stamps/extract-nashorn.stamp
mkdir -p stamps
touch $@
@@ -953,8 +979,32 @@
rm -rf openjdk/hotspot
rm -f stamps/extract-hotspot.stamp
+stamps/extract-nashorn.stamp: stamps/extract-openjdk.stamp stamps/download-nashorn.stamp
+if !OPENJDK_SRC_DIR_FOUND
+ set -e ; \
+ if [ ! -z $(NASHORN_SRC_ZIP) ] ; then \
+ if test -e ${NASHORN_SRC_ZIP} ; \
+ then \
+ if ! test -d openjdk/nashorn ; \
+ then \
+ case "$(NASHORN_SRC_ZIP)" in \
+ *.zip) $(UNZIP) -q $(NASHORN_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(NASHORN_SRC_ZIP) ;; \
+ esac; \
+ mv nashorn-$(NASHORN_CHANGESET) openjdk/nashorn ; \
+ fi ; \
+ fi ; \
+ fi
+endif
+ mkdir -p stamps
+ touch $@
+
+clean-extract-nashorn:
+ rm -rf openjdk/nashorn
+ rm -f stamps/extract-nashorn.stamp
+
stamps/sanitise-openjdk.stamp: stamps/extract-openjdk.stamp \
- stamps/extract-hotspot.stamp
+ stamps/extract-hotspot.stamp stamps/extract-nashorn.stamp
chmod -R ug+w openjdk
sh $(srcdir)/fsg.sh
touch stamps/sanitise-openjdk.stamp
@@ -1137,28 +1187,28 @@
fi
stamps/versioning.stamp: stamps/patch.stamp
- mv openjdk/jdk/make/common/shared/Defs.gmk Defs.gmk.bak
- cat Defs.gmk.bak > openjdk/jdk/make/common/shared/Defs.gmk
+ mv $(VERSION_SETTINGS_FILE) ProfileNames.gmk.bak
+ cat ProfileNames.gmk.bak > $(VERSION_SETTINGS_FILE)
icedtea_version="$(PACKAGE_VERSION)$(ICEDTEA_REV)" ; \
if test "x$(ENABLE_CACAO)" = "xyes" || \
test "x$(ENABLE_JAMVM)" = "xyes"; then \
echo "JDK_DERIVATIVE_NAME=$${icedtea_version}" \
- >>openjdk/jdk/make/common/shared/Defs.gmk ; \
+ >>$(VERSION_SETTINGS_FILE) ; \
echo "PRODUCT_NAME=$(ICEDTEA_NAME)" \
- >>openjdk/jdk/make/common/shared/Defs.gmk ; \
+ >>$(VERSION_SETTINGS_FILE) ; \
else \
echo "JDK_DERIVATIVE_NAME=$(ICEDTEA_NAME) $${icedtea_version}" \
- >>openjdk/jdk/make/common/shared/Defs.gmk ; \
+ >>$(VERSION_SETTINGS_FILE) ; \
fi ;
if HAS_JDK_REVISION
- echo "JDK_REVID=$(JDK_REVISION)" >>openjdk/jdk/make/common/shared/Defs.gmk ;
+ echo "JDK_REVID=$(JDK_REVISION)" >>$(VERSION_SETTINGS_FILE) ;
endif
- echo "DISTRO_NAME=$(DIST_NAME)" >>openjdk/jdk/make/common/shared/Defs.gmk ;
+ echo "DISTRO_NAME=$(DIST_NAME)" >>$(VERSION_SETTINGS_FILE) ;
if HAS_PKGVERSION
echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
- >>openjdk/jdk/make/common/shared/Defs.gmk ;
+ >>$(VERSION_SETTINGS_FILE) ;
endif
if test x"$(PROJECT_NAME)" != "xjdk8"; then \
proj_suffix="-$(PROJECT_NAME)"; \
@@ -1167,7 +1217,7 @@
ver_suffix="-$(VERSION_SUFFIX)"; \
fi ; \
sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \
- openjdk/jdk/make/common/shared/Defs.gmk;
+ $(VERSION_SETTINGS_FILE);
mkdir -p stamps
touch $@
diff -r 24d0bdd59f32 -r 8543b35292bb NEWS
--- a/NEWS Fri Apr 18 20:41:34 2014 +0100
+++ b/NEWS Fri May 30 22:31:03 2014 +0100
@@ -12,13 +12,30 @@
New in release 3.0.0 (2014-XX-XX):
+* Backports
+ - S8011278: Allow using a system-installed giflib
+ - S8035341: Allow using a system installed libpng
+ - S8038392: Generating prelink cache breaks JAVA 'jinfo' utility normal behavior
+ - S8042159: Allow using a system-installed lcms2
+ - S8042806: Splashscreen uses libjpeg-internal macros
* Bug fixes
+ - S8041658: Use of -fdevirtualize on macroAssembler_x86.o (via -O2) with gcc 4.9.0 creates broken VM
- PR1279: Synchronise CACAO versions between IcedTea6/7/8 where possible
- PR1325: Only add classes to rt-source-files.txt if actually needed
- PR1346: Filter out -j option to make
- PR1347: Update list of checked JDKs
- PR1357: Make XRender mandatory
- PR1359: Check for /usr/lib64 JVMs and generic JPackage alternative
+ - Don't substitute 'j' for '-j' inside -I directives
+ - Extend 8041658 to all files in the HotSpot build.
+ - PR1748: Allow clang to be used to build
+ - PR1766: Expand architecture support
+ - PR1774: Correct #ifdef to #if
+ - PR1774: Support GIF lib v5
+ - PR1778: Allow an alternate JAR program to be used
+ - PR1796: make fails with "computed checksum did NOT match"
+ - Remove jcheck
+ - PR1806: Support Debian/Ubuntu 7 & 8 OpenJDK Installs as Boot JDK
* JamVM
- JSR 292: Invoke Dynamic
- JSR 308: Type Annotations
diff -r 24d0bdd59f32 -r 8543b35292bb acinclude.m4
--- a/acinclude.m4 Fri Apr 18 20:41:34 2014 +0100
+++ b/acinclude.m4 Fri May 30 22:31:03 2014 +0100
@@ -1144,10 +1144,10 @@
fi
ICEDTEA7_VMS="/usr/lib/jvm/icedtea-7 /usr/lib/jvm/icedtea7 /usr/lib/jvm/java-1.7.0-openjdk
/usr/lib/jvm/java-1.7.0-openjdk.x86_64 /usr/lib64/jvm/java-1.7.0-openjdk
- /usr/lib/jvm/java-1.7.0"
+ /usr/lib/jvm/java-1.7.0 /usr/lib/jvm/java-7-openjdk"
ICEDTEA8_VMS="/usr/lib/jvm/icedtea-8 /usr/lib/jvm/java-1.8.0-openjdk
/usr/lib/jvm/java-1.8.0-openjdk.x86_64 /usr/lib64/jvm/java-1.8.0-openjdk
- /usr/lib/jvm/java-1.8.0"
+ /usr/lib/jvm/java-1.8.0 /usr/lib/jvm/java-8-openjdk"
for dir in ${ICEDTEA8_VMS} ${ICEDTEA7_VMS} ${BOOTSTRAP_VMS} \
/usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea \
/etc/alternatives/java_sdk_openjdk ; do
@@ -1902,3 +1902,24 @@
AC_MSG_RESULT(${ALT_JAMVM_SRC_ZIP})
AC_SUBST(ALT_JAMVM_SRC_ZIP)
])
+
+AC_DEFUN([IT_WITH_NASHORN_SRC_ZIP],
+[
+ AC_MSG_CHECKING([for a NASHORN source zip])
+ AC_ARG_WITH([nashorn-src-zip],
+ [AS_HELP_STRING(--with-nashorn-src-zip=PATH,specify the location of the Nashorn source zip)],
+ [
+ ALT_NASHORN_SRC_ZIP=${withval}
+ if test "x${ALT_NASHORN_SRC_ZIP}" = "xno"; then
+ ALT_NASHORN_SRC_ZIP="not specified"
+ elif ! test -f ${ALT_NASHORN_SRC_ZIP} ; then
+ AC_MSG_ERROR([Invalid NASHORN source zip specified: ${ALT_NASHORN_SRC_ZIP}])
+ fi
+ ],
+ [
+ ALT_NASHORN_SRC_ZIP="not specified"
+ ])
+ AM_CONDITIONAL(USE_ALT_NASHORN_SRC_ZIP, test "x${ALT_NASHORN_SRC_ZIP}" != "xnot specified")
+ AC_MSG_RESULT(${ALT_NASHORN_SRC_ZIP})
+ AC_SUBST(ALT_NASHORN_SRC_ZIP)
+])
diff -r 24d0bdd59f32 -r 8543b35292bb configure.ac
--- a/configure.ac Fri Apr 18 20:41:34 2014 +0100
+++ b/configure.ac Fri May 30 22:31:03 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [3.0b1pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [3.0.0pre01], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
@@ -126,6 +126,7 @@
IT_WITH_JAXWS_SRC_ZIP
IT_WITH_JDK_SRC_ZIP
IT_WITH_LANGTOOLS_SRC_ZIP
+IT_WITH_NASHORN_SRC_ZIP
IT_WITH_ALT_JAR_BINARY
IT_ENABLE_CACAO
diff -r 24d0bdd59f32 -r 8543b35292bb hotspot.map
--- a/hotspot.map Fri Apr 18 20:41:34 2014 +0100
+++ b/hotspot.map Fri May 30 22:31:03 2014 +0100
@@ -1,2 +1,2 @@
# version url changeset md5sum
-default http://hg.openjdk.java.net/jdk8/jdk8/hotspot 65b797426a3b a91ac222d0cd8fd2d3e02bb5ec53d49d3ecebffa2dc4506c86679709217b2366
+default http://icedtea.classpath.org/hg/icedtea8-forest/hotspot c2767d721605 153ad9d1405ee6878b0871cd6df7ff9c7bb62b5117a293aa063783e379bc337e
diff -r 24d0bdd59f32 -r 8543b35292bb patches/alt-jar.patch
--- a/patches/alt-jar.patch Fri Apr 18 20:41:34 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- 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?)
diff -r 24d0bdd59f32 -r 8543b35292bb patches/cacao/arch.patch
--- a/patches/cacao/arch.patch Fri Apr 18 20:41:34 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-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 2012-09-05 20:58:45.000000000 +0100
-+++ openjdk/jdk/make/common/Defs-linux.gmk 2012-09-07 02:18:13.610370442 +0100
-@@ -190,9 +190,19 @@
- # We need this frame pointer to make it easy to walk the stacks.
- # This should be the default on X86, but ia64 and amd64 may not have this
- # as the default.
-+CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
- CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
More information about the distro-pkg-dev
mailing list