/hg/release/icedtea7-2.5: 11 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jun 5 17:54:16 UTC 2014
changeset 8ff290dd997a in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=8ff290dd997a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 05 02:53:33 2014 +0100
Update to icedtea-2.5pre07.
PR1742: Allow SunEC provider to be built with changes in NSS >= 3.16.1
S8036861: Application can't be loaded fine,the save dialog can't show up.
S8038306: (tz) Support tzdata2014b
S8012224: AWT_TopLevels/TopLevelEvents/Automated/WindowIconifyDeiconifyEventsTest02 fails on Ubuntu 12.04 Unity shell
2014-06-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(BUILD_VERSION): Bump to b30.
(CORBA_CHANGESET): Update to icedtea-2.5pre07 tag.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* NEWS: Updated.
* configure.ac: Bump to pre07.
* hotspot.map: Update to icedtea-2.5pre07tag.
2014-04-23 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1742: Allow SunEC provider to be built with changes
in NSS >= 3.16.1
* Makefile.am:
(ICEDTEA_ENV): Use SUNEC_LIBS and SUNEC_CFLAGS
instead of NSS_LIBS and NSS_CFLAGS respectively.
* acinclude.m4:
(IT_ENABLE_SUNEC): Use SUNEC_CFLAGS and SUNEC_LIBS
for clarity as NSS_CFLAGS and NSS_LIBS are also set
by the NSS detection.
2014-04-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1699: Support building the SunEC provider with system NSS
* Makefile.am:
(ICEDTEA_ENV): Only add DISABLE_INTREE_EC if
ENABLE_SUNEC is not set. Set SYSTEM_NSS in both
cases and NSS_LIBS, NSS_CFLAGS and ECC_JUST_SUITE_B
when ENABLE_SUNEC is set.
* acinclude.m4:
(IT_LOCATE_NSS): Fix wording to make it clear that
this is the PKCS11 provider, using NSS as the
implementation.
(IT_ENABLE_SUNEC): Allow the Sun elliptic curve
crypto provider to be enabled.
* configure.ac:
Replace IT_LOCATE_NSS with IT_ENABLE_SUNEC (which
depends on the former).
* fsg.sh:
Only delete the SunEC implementation code at this
level. This is the part that is legally dubious,
due to the use of many more elliptic curves than
those provided by the NSS version.
* remove-intree-libraries.sh.in:
Include the remaining SunEC deletion from fsg.sh
here and make it optional.
changeset f29672153a63 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=f29672153a63
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 05 03:07:35 2014 +0100
PR1762: Undefined references when building with NSS 3.16.1
2014-05-09 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1762: Undefined references when building with NSS 3.16.1
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_SUNEC): For NSS >= 3.16.1, add -lfreebl
to SUNEC_LIBS, not SUNEC_CFLAGS, and use NSS_LIBS as
the base, not NSS_SOFTOKN_LIBS.
changeset efab00a8197a in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=efab00a8197a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Apr 17 02:53:39 2014 +0100
PR1737: Support prefixed variants of GNU tools used on *BSD systems
2014-04-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
* AUTHORS: Add Radim Kolar.
* acinclude.m4:
(IT_FIND_TOOL): Cleanup error message.
(IT_FIND_TOOLS): Likewise.
2014-03-20 Radim Kolar <hsn at sanatana.filez.com>
* Makefile.am:
(extract-openjdk): Use $(SED) instead of 'sed'.
(versioning): Likewise.
(add-systemtap): Likewise.
(add-systemtap-debug): Likewise.
(add-systemtap-boot): Likewise.
(rewrite-rhino): Likewise.
(clean-add-jamvm): Likewise.
(clean-add-jamvm-debug): Likewise.
(clean-add-cacao): Likewise.
(clean-add-cacao-debug): Likewise.
(clean-add-zero): Likewise.
(clean-add-zero-debug): Likewise.
(jtreg_processes): Likewise.
(rt): Likewise.
* acinclude.m4:
(IT_FIND_TOOLS): New macro to check for
multiple tools.
* configure.ac: Check for gmake, gfind, gpatch,
gsha256sum and gsed (GNU tools on *BSD).
changeset f164e91b0ca7 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=f164e91b0ca7
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 05 03:11:26 2014 +0100
Mention PR1737 in NEWS.
2014-04-16 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS:
Mention PR1737.
changeset b9b6ccc93bdc in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=b9b6ccc93bdc
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 05 16:40:42 2014 +0100
PR1756: Bootstrap with IcedTea broken
2014-05-01 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1756: Bootstrap with IcedTea broken
* Makefile.am:
(ICEDTEA_BOOT_PATCHES): Only apply ant-javac.patch
when using bootstrap tools. Only patch JAXWS build
when the bootstrap JDK doesn't have the com.sun.*
classes it requires. Split the root patch in
corba-dependencies.patch into its own file.
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_JDK): Make DEFUN_ONCE and fix typo.
(IT_CHECK_FOR_CLASS): Depend on IT_CHECK_TOOLS_JAR_EXISTS
and adds TOOLS_JAR to classpath.
(IT_CHECK_TOOLS_JAR_EXISTS): Find a tools.jar so
we can check for classes it contains.
* configure.ac:
Check for com.sun.mirror.type.TypeMirror and
com.sun.net.httpserver.Headers, required by JAXWS.
* patches/boot/corba-dependencies.patch:
Remove root part of patch.
* patches/boot/dependencies.patch:
Root part of patch from corba-dependencies.
* patches/boot/jaxws-jdk-dependency.patch:
Regenerated.
* patches/boot/jaxws-langtools-dependency.patch:
Rewrite to use sources, not classes.
changeset 12240198c6be in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=12240198c6be
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 05 16:42:26 2014 +0100
PR1758: Support PPC64 JIT on ppc64le
2014-05-01 Andrew John Hughes <gnu.andrew at member.fsf.org>
* AUTHORS: Add Tiago.
* NEWS: Updated.
* acinclude.m4:
(IT_SET_ARCH_SETTINGS): Expand ppc64le to its
own block to avoid potential future collisions.
(IT_ENABLE_ZERO_BUILD): Likewise.
2014-05-01 Tiago Sturmer Daitx <tdaitx at linux.vnet.ibm.com>
* acinclude.m4:
(IT_SET_ARCH_SETTINGS): Support ppc64le.
(IT_ENABLE_ZERO_BUILD): Likewise and use correct
host_cpu value for ppc64.
changeset 3c98e219395e in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=3c98e219395e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 05 16:44:44 2014 +0100
PR1763: ppc64 JIT doesn't support class data sharing
2014-05-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(add-archive): Skip on ppc64.
(add-archive-debug): Likewise.
(add-archive-boot): Likewise.
* NEWS: Updated.
changeset b68a0fe00baa in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=b68a0fe00baa
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 05 16:45:51 2014 +0100
PR1765: Boot JDK on ppc64le uses differently named arch directory to final build
2014-05-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1765: Boot JDK on ppc64le uses differently named
arch directory to final build
* Makefile.am:
(bootstrap-directory-stage1): Handle ppc64le boot
JDK using a different arch directory to the final
build. Make output more verbose.
* NEWS: Updated.
changeset 68fba62e38ab in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=68fba62e38ab
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 05 16:49:22 2014 +0100
PR1807: Support Debian/Ubuntu 7 OpenJDK Install as Boot JDK
2014-06-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1807: Support Debian/Ubuntu 7 OpenJDK
Install as Boot JDK
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_JDK): Add java-7-openjdk
to ICEDTEA7_VMS.
changeset 655014a92f22 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=655014a92f22
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 05 16:50:10 2014 +0100
PR1365: Replace hgforest support
2014-06-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
* INSTALL:
Remove documentation of --with-project as
option is being removed.
* Makefile.am:
(OPENJDK_HG_URL): Removed.
(CVMI_HG_URL): Likewise.
(CLOSURES_HG_URL): Likewise.
(CACIOCAVALLO_HG_URL): Likewise.
(BSD_HG_URL): Likewise.
(NIO2_HG_URL): Likewise.
(REV_ARG): Added and set conditionally if
$(HGREV) is set.
(clean-local): Drop clean-hgforest.
(hgforest): Removed.
(clean-hgforest): Likewise.
(download-openjdk): Remove project conditionals.
Replace fclone usage with multiple clone calls.
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_HG): Drop IT_WITH_PROJECT dependency
and simply to yes/no.
(IT_WITH_PROJECT): Removed.
* configure.ac: Drop IT_WITH_PROJECT.
changeset f990f8b724ad in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=f990f8b724ad
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 05 16:50:44 2014 +0100
PR1814: HotSpot URL should be used with --enable-hg
2014-06-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1814: HotSpot URL should be used with --enable-hg
* Makefile.am:
(.PHONY): Add clean-download-hotspot.
(download); Depend on download-hotspot.
(clean-download): Move clean-download-nashorn
to clean-download-openjdk to retain ordering.
(download-openjdk): Remove hotspot from for loop
and HotSpot zip download rules.
(clean-download-openjdk): Depend on clean-download-hotspot.
(download-hotspot): New target. Cloning now uses HS_URL
as with zip downloading.
(clean-download-hotspot): Separated from clean-download-openjdk.
(extract-hotspot): Depend on download-hotspot.
* NEWS: Updated.
diffstat:
AUTHORS | 2 +
ChangeLog | 218 +++++++++++++++++++
INSTALL | 3 -
Makefile.am | 290 +++++++++++++-------------
NEWS | 13 +
acinclude.m4 | 152 +++++++++----
configure.ac | 28 +-
fsg.sh | 8 +-
hotspot.map | 2 +-
patches/boot/corba-dependencies.patch | 11 -
patches/boot/dependencies.patch | 11 +
patches/boot/jaxws-jdk-dependency.patch | 46 ++--
patches/boot/jaxws-langtools-dependency.patch | 80 +++---
remove-intree-libraries.sh.in | 10 +
14 files changed, 580 insertions(+), 294 deletions(-)
diffs (truncated from 1451 to 500 lines):
diff -r 97f337a7c17f -r f990f8b724ad AUTHORS
--- a/AUTHORS Wed Jun 04 14:49:24 2014 +0100
+++ b/AUTHORS Thu Jun 05 16:50:44 2014 +0100
@@ -8,6 +8,7 @@
Deepak Bhole <dbhole at redhat.com>
Tom Callaway <tcallawa at redhat.com>
Pablo del Campo <pablogdc at gmail.com>
+Tiago Sturmer Daitx <tdaitx at linux.vnet.ibm.com>
Thomas Fitzsimmons <fitzsim at redhat.com>
Matthew Flaschen <matthew.flaschen at gatech.edu>
Michael Franz <mvfranz at gmail.com>
@@ -18,6 +19,7 @@
Andrew John Hughes <gnu_andrew at member.fsf.org, gnu.andrew at redhat.com>
Tomas Hurka <tomas.hurka at sun.com>
Ioana Ivan <iivan at redhat.com>
+Radim Kolar <hsn at sanatana.filez.com>
Matthias Klose <doko at ubuntu.com>
Francis Kung <fkung at redhat.com>
DJ Lucas <dj at linuxfromscratch.org>
diff -r 97f337a7c17f -r f990f8b724ad ChangeLog
--- a/ChangeLog Wed Jun 04 14:49:24 2014 +0100
+++ b/ChangeLog Thu Jun 05 16:50:44 2014 +0100
@@ -1,3 +1,221 @@
+2014-06-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1814: HotSpot URL should be used with --enable-hg
+ * Makefile.am:
+ (.PHONY): Add clean-download-hotspot.
+ (download); Depend on download-hotspot.
+ (clean-download): Move clean-download-nashorn
+ to clean-download-openjdk to retain ordering.
+ (download-openjdk): Remove hotspot from for loop
+ and HotSpot zip download rules.
+ (clean-download-openjdk): Depend on clean-download-hotspot.
+ (download-hotspot): New target. Cloning now uses HS_URL
+ as with zip downloading.
+ (clean-download-hotspot): Separated from clean-download-openjdk.
+ (extract-hotspot): Depend on download-hotspot.
+ * NEWS: Updated.
+
+2014-06-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1365: Replace hgforest support
+ * INSTALL:
+ Remove documentation of --with-project as
+ option is being removed.
+ * Makefile.am:
+ (OPENJDK_HG_URL): Removed.
+ (CVMI_HG_URL): Likewise.
+ (CLOSURES_HG_URL): Likewise.
+ (CACIOCAVALLO_HG_URL): Likewise.
+ (BSD_HG_URL): Likewise.
+ (NIO2_HG_URL): Likewise.
+ (REV_ARG): Added and set conditionally if
+ $(HGREV) is set.
+ (clean-local): Drop clean-hgforest.
+ (hgforest): Removed.
+ (clean-hgforest): Likewise.
+ (download-openjdk): Remove project conditionals.
+ Replace fclone usage with multiple clone calls.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_HG): Drop IT_WITH_PROJECT dependency
+ and simply to yes/no.
+ (IT_WITH_PROJECT): Removed.
+ * configure.ac: Drop IT_WITH_PROJECT.
+
+2014-06-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1807: Support Debian/Ubuntu 7 OpenJDK
+ Install as Boot JDK
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_JDK): Add java-7-openjdk
+ to ICEDTEA7_VMS.
+
+2014-05-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1765: Boot JDK on ppc64le uses differently named
+ arch directory to final build
+ * Makefile.am:
+ (bootstrap-directory-stage1): Handle ppc64le boot
+ JDK using a different arch directory to the final
+ build. Make output more verbose.
+ * NEWS: Updated.
+
+2014-05-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1763: ppc64 JIT doesn't support class data sharing
+ * Makefile.am:
+ (add-archive): Skip on ppc64.
+ (add-archive-debug): Likewise.
+ (add-archive-boot): Likewise.
+ * NEWS: Updated.
+
+2014-05-01 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * AUTHORS: Add Tiago.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_SET_ARCH_SETTINGS): Expand ppc64le to its
+ own block to avoid potential future collisions.
+ (IT_ENABLE_ZERO_BUILD): Likewise.
+
+2014-05-01 Tiago Sturmer Daitx <tdaitx at linux.vnet.ibm.com>
+
+ * acinclude.m4:
+ (IT_SET_ARCH_SETTINGS): Support ppc64le.
+ (IT_ENABLE_ZERO_BUILD): Likewise and use correct
+ host_cpu value for ppc64.
+
+2014-05-01 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1756: Bootstrap with IcedTea broken
+ * Makefile.am:
+ (ICEDTEA_BOOT_PATCHES): Only apply ant-javac.patch
+ when using bootstrap tools. Only patch JAXWS build
+ when the bootstrap JDK doesn't have the com.sun.*
+ classes it requires. Split the root patch in
+ corba-dependencies.patch into its own file.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_JDK): Make DEFUN_ONCE and fix typo.
+ (IT_CHECK_FOR_CLASS): Depend on IT_CHECK_TOOLS_JAR_EXISTS
+ and adds TOOLS_JAR to classpath.
+ (IT_CHECK_TOOLS_JAR_EXISTS): Find a tools.jar so
+ we can check for classes it contains.
+ * configure.ac:
+ Check for com.sun.mirror.type.TypeMirror and
+ com.sun.net.httpserver.Headers, required by JAXWS.
+ * patches/boot/corba-dependencies.patch:
+ Remove root part of patch.
+ * patches/boot/dependencies.patch:
+ Root part of patch from corba-dependencies.
+ * patches/boot/jaxws-jdk-dependency.patch:
+ Regenerated.
+ * patches/boot/jaxws-langtools-dependency.patch:
+ Rewrite to use sources, not classes.
+
+2014-04-16 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS:
+ Mention PR1737.
+
+2014-04-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * AUTHORS: Add Radim Kolar.
+ * acinclude.m4:
+ (IT_FIND_TOOL): Cleanup error message.
+ (IT_FIND_TOOLS): Likewise.
+
+2014-03-20 Radim Kolar <hsn at sanatana.filez.com>
+
+ * Makefile.am:
+ (extract-openjdk): Use $(SED) instead of 'sed'.
+ (versioning): Likewise.
+ (add-systemtap): Likewise.
+ (add-systemtap-debug): Likewise.
+ (add-systemtap-boot): Likewise.
+ (rewrite-rhino): Likewise.
+ (clean-add-jamvm): Likewise.
+ (clean-add-jamvm-debug): Likewise.
+ (clean-add-cacao): Likewise.
+ (clean-add-cacao-debug): Likewise.
+ (clean-add-zero): Likewise.
+ (clean-add-zero-debug): Likewise.
+ (jtreg_processes): Likewise.
+ (rt): Likewise.
+ * acinclude.m4:
+ (IT_FIND_TOOLS): New macro to check for
+ multiple tools.
+ * configure.ac: Check for gmake, gfind, gpatch,
+ gsha256sum and gsed (GNU tools on *BSD).
+
+2014-05-09 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1762: Undefined references when building with NSS 3.16.1
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_SUNEC): For NSS >= 3.16.1, add -lfreebl
+ to SUNEC_LIBS, not SUNEC_CFLAGS, and use NSS_LIBS as
+ the base, not NSS_SOFTOKN_LIBS.
+
+2014-06-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (BUILD_VERSION): Bump to b30.
+ (CORBA_CHANGESET): Update to icedtea-2.5pre07 tag.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * NEWS: Updated.
+ * configure.ac: Bump to pre07.
+ * hotspot.map: Update to icedtea-2.5pre07tag.
+
+2014-04-23 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1742: Allow SunEC provider to be built with changes
+ in NSS >= 3.16.1
+ * Makefile.am:
+ (ICEDTEA_ENV): Use SUNEC_LIBS and SUNEC_CFLAGS
+ instead of NSS_LIBS and NSS_CFLAGS respectively.
+ * acinclude.m4:
+ (IT_ENABLE_SUNEC): Use SUNEC_CFLAGS and SUNEC_LIBS
+ for clarity as NSS_CFLAGS and NSS_LIBS are also set
+ by the NSS detection.
+
+2014-04-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1699: Support building the SunEC provider with system NSS
+ * Makefile.am:
+ (ICEDTEA_ENV): Only add DISABLE_INTREE_EC if
+ ENABLE_SUNEC is not set. Set SYSTEM_NSS in both
+ cases and NSS_LIBS, NSS_CFLAGS and ECC_JUST_SUITE_B
+ when ENABLE_SUNEC is set.
+ * acinclude.m4:
+ (IT_LOCATE_NSS): Fix wording to make it clear that
+ this is the PKCS11 provider, using NSS as the
+ implementation.
+ (IT_ENABLE_SUNEC): Allow the Sun elliptic curve
+ crypto provider to be enabled.
+ * configure.ac:
+ Replace IT_LOCATE_NSS with IT_ENABLE_SUNEC (which
+ depends on the former).
+ * fsg.sh:
+ Only delete the SunEC implementation code at this
+ level. This is the part that is legally dubious,
+ due to the use of many more elliptic curves than
+ those provided by the NSS version.
+ * remove-intree-libraries.sh.in:
+ Include the remaining SunEC deletion from fsg.sh
+ here and make it optional.
+
2014-06-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
* INSTALL: Replace documentation of
diff -r 97f337a7c17f -r f990f8b724ad INSTALL
--- a/INSTALL Wed Jun 04 14:49:24 2014 +0100
+++ b/INSTALL Thu Jun 05 16:50:44 2014 +0100
@@ -175,9 +175,6 @@
* --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
* --with-llvm-config: Specify the location of the llvm-config binary.
* --with-version-suffix: Appends the given text to the JDK version output.
-* --with-project: Build an OpenJDK project from the following: icedtea, jdk7, closures, cvmi, cacaiocavallo,
- bsd, nio2. The default is icedtea. Use of others is at the user's risk and builds may fail. This setting
- affects which forest is checked out when --enable-hg is used and the set of patches applied.
* --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK.
* --with-pax: The command used to PaX-mark built binaries.
* --enable-Werror: Turn gcc & javac warnings into errors.
diff -r 97f337a7c17f -r f990f8b724ad Makefile.am
--- a/Makefile.am Wed Jun 04 14:49:24 2014 +0100
+++ b/Makefile.am Thu Jun 05 16:50:44 2014 +0100
@@ -1,22 +1,22 @@
# Dependencies
JDK_UPDATE_VERSION = 60
-BUILD_VERSION = b15
+BUILD_VERSION = b30
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 1650f85c0dee
-JAXP_CHANGESET = 49ca8c230020
-JAXWS_CHANGESET = 3a7c902a4390
-JDK_CHANGESET = 575b3a2fa6c9
-LANGTOOLS_CHANGESET = 853f886673d8
-OPENJDK_CHANGESET = 716796f6c6f0
+CORBA_CHANGESET = 03a1bf9a9e89
+JAXP_CHANGESET = f4ad8e860eaf
+JAXWS_CHANGESET = 9699fe5c5232
+JDK_CHANGESET = 5607f5a99784
+LANGTOOLS_CHANGESET = 454870780579
+OPENJDK_CHANGESET = d42df0b6ea9d
-CORBA_SHA256SUM = 11503511cac59fa9d18d955b0db1de2217723be3e3b997a5485aa19ca0353c5a
-JAXP_SHA256SUM = b65e71685224d288be7f9656372463944dcb56f1e0688d94b78f1b1616e34af8
-JAXWS_SHA256SUM = b879454336dba2a27bb61528e80ba242a5e2cda657fd5096f8242a8b9c8331ce
-JDK_SHA256SUM = abe758688db8a41b338eb09ce2e3b84e205e271ae51f76de39528ed84a49a70a
-LANGTOOLS_SHA256SUM = 2d6f659521792661cdc3156cfa6efaebc84a77548d613a66331805ff0fbe8115
-OPENJDK_SHA256SUM = 7c8142b0981d4f47818754a1e1d15d9a99c351eadd173c8af7248f5163413dc7
+CORBA_SHA256SUM = 5f7f0c37aa0b370947bda59c6799db94e8da6aba1a82750b29907109e0326069
+JAXP_SHA256SUM = 9fe737e113ecc1424c6036fefaee4f34cd6df657a4a2ecc7b61bbab1b61e8d25
+JAXWS_SHA256SUM = cc2fc8f11e30b51cde58af756814ffa395d9b8119f9849c2681c3453f0e60d83
+JDK_SHA256SUM = 6e3070303649fe2dc98a8407f8ad9fad33208302e504dd623695e8ad0b12fae8
+LANGTOOLS_SHA256SUM = e5f761b19b250d71449cf247b265ba3cb6a0b1963621133a5712dbe30643f5d0
+OPENJDK_SHA256SUM = 9ffde89bb02d1da7ef5ca77ac100d4eefd4767cb93a87cda1deaefb6a5e1a750
CACAO_VERSION = e215e36be9fc
CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
@@ -32,12 +32,6 @@
ICEDTEA_PREFIX = icedtea7-forest-2.5
ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/release/$(ICEDTEA_PREFIX)
-OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
-CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
-CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
-CACIOCAVALLO_HG_URL = http://hg.openjdk.java.net/caciocavallo/jdk7/
-BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port
-NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/
OPENJDK_URL = $(ICEDTEA_HG_URL)
CORBA_URL = $(ICEDTEA_HG_URL)/corba
@@ -172,6 +166,10 @@
HOTSPOT_SRC_ZIP = hotspot.tar.gz
endif
+if WITH_HGREV
+REV_ARG = -r $(HGREV)
+endif
+
if ENABLE_PULSE_JAVA
PULSE_JAVA_TARGET = stamps/pulse-java.stamp
endif
@@ -307,7 +305,6 @@
ICEDTEA_BOOT_PATCHES = \
patches/boot/javafiles.patch \
- patches/boot/ant-javac.patch \
patches/boot/corba-idlj.patch \
patches/boot/corba-no-gen.patch \
patches/boot/corba-orb.patch \
@@ -328,9 +325,8 @@
patches/boot/revert-6941137.patch \
patches/boot/ecj-stringswitch.patch \
patches/boot/langtools-force-old-jdk.patch \
+ patches/boot/dependencies.patch \
patches/boot/corba-dependencies.patch \
- patches/boot/jaxws-langtools-dependency.patch \
- patches/boot/jaxws-jdk-dependency.patch \
patches/boot/hotspot-jdk-dependency.patch \
patches/boot/ecj-multicatch.patch \
patches/boot/ecj-trywithresources.patch \
@@ -340,7 +336,18 @@
if !DISABLE_BOOTSTRAP_TOOLS
ICEDTEA_BOOT_PATCHES += \
- patches/boot/bootstrap-tools.patch
+ patches/boot/bootstrap-tools.patch \
+ patches/boot/ant-javac.patch
+endif
+
+if LACKS_COM_SUN_MIRROR_TYPE_TYPEMIRROR
+ICEDTEA_BOOT_PATCHES += \
+ patches/boot/jaxws-langtools-dependency.patch
+endif
+
+if LACKS_COM_SUN_NET_HTTPSERVER_HEADERS
+ICEDTEA_BOOT_PATCHES += \
+ patches/boot/jaxws-jdk-dependency.patch
endif
if !VM_SUPPORTS_XBOOTCLASSPATH
@@ -473,7 +480,6 @@
ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" \
DEBUG_CLASSFILES="true" \
DEBUG_BINARIES="true" \
- DISABLE_INTREE_EC="true" \
ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \
VERBOSE="$(VERBOSE)" \
STATIC_CXX="false" \
@@ -562,6 +568,18 @@
PAX_COMMAND="${PAX_COMMAND}"
endif
+if ENABLE_SUNEC
+ICEDTEA_ENV += \
+ SYSTEM_NSS="true" \
+ NSS_LIBS="${SUNEC_LIBS}" \
+ NSS_CFLAGS="${SUNEC_CFLAGS}" \
+ ECC_JUST_SUITE_B="true"
+else
+ICEDTEA_ENV += \
+ SYSTEM_NSS="false" \
+ DISABLE_INTREE_EC="true"
+endif
+
# OpenJDK boot build environment.
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
@@ -771,7 +789,7 @@
clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
- clean-extract clean-generated clean-native-ecj clean-hgforest clean-icedtea-stage2 \
+ clean-extract clean-generated clean-native-ecj clean-icedtea-stage2 \
clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \
clean-add-systemtap clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \
@@ -810,7 +828,8 @@
clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \
clean-add-systemtap-boot clean-add-pulseaudio-boot clean-add-tzdata-support-boot \
clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
- clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck
+ clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \
+ clean-download-hotspot
env:
@echo 'unset JAVA_HOME'
@@ -840,59 +859,24 @@
# OpenJDK Source Preparation Targets
# ==================================
-# Check for forest support
-
-stamps/hgforest.stamp:
-if USE_HG
- if ! $(HG) fclone -h; \
- then \
- echo "No forest extension found. Please refer to" \
- "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
- exit 1; \
- fi;
-endif
- mkdir -p stamps
- touch $@
-
-clean-hgforest:
- rm -f stamps/hgforest.stamp
-
# Download OpenJDK sources.
stamps/download.stamp: stamps/download-openjdk.stamp \
- stamps/download-cacao.stamp stamps/download-jamvm.stamp
+ stamps/download-cacao.stamp stamps/download-jamvm.stamp stamps/download-hotspot.stamp
mkdir -p stamps
touch $@
clean-download: clean-download-openjdk clean-download-cacao clean-download-jamvm
rm -f stamps/download.stamp
-stamps/download-openjdk.stamp: stamps/hgforest.stamp
-if !OPENJDK_SRC_DIR_FOUND
-if USE_CLOSURES
- $(HG) fclone $(CLOSURES_HG_URL) openjdk;
-else
-if USE_CVMI
- $(HG) fclone $(CVMI_HG_URL) openjdk;
-else
-if USE_CACIOCAVALLO
- $(HG) fclone $(CACIOCAVALLO_HG_URL) openjdk;
-else
-if USE_BSD
- $(HG) fclone $(BSD_HG_URL) openjdk;
-else
-if USE_NIO2
- hg fclone $(NIO2_HG_URL) openjdk;
-else
-if USE_JDK7
- hg fclone $(OPENJDK_HG_URL) openjdk;
+stamps/download-openjdk.stamp:
+if OPENJDK_SRC_DIR_FOUND
else
if USE_HG
-if WITH_HGREV
- $(HG) fclone -r $(HGREV) $(ICEDTEA_HG_URL) openjdk;
-else
- $(HG) fclone $(ICEDTEA_HG_URL) openjdk;
-endif
+ $(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL) openjdk;
+ for repos in corba jaxp jaxws langtools jdk ; do \
+ $(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL)/$${repos} openjdk/$${repos}; \
+ done
else
if USE_ALT_OPENJDK_SRC_ZIP
ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
@@ -1008,38 +992,12 @@
echo "ERROR: No up-to-date OpenJDK langtools zip available"; exit -1; \
fi ; \
fi ;
-if USE_ALT_HOTSPOT_SRC_ZIP
- ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP)
-endif
- echo "Using HotSpot build: ${HSBUILD}"
- if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \
- | $(SHA256SUM) --check ; \
- then \
- if test "x$(enable_downloading)" = "xyes"; then \
- if [ -e $(HOTSPOT_SRC_ZIP) ] ; then \
- mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
- fi ; \
- $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
- if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \
- | $(SHA256SUM) --check ; then \
- echo "ERROR: Bad download of HotSpot zip"; false; \
- fi; \
- else \
- echo "ERROR: No up-to-date OpenJDK HotSpot zip available"; exit -1; \
- fi ; \
- fi
-endif
-endif
-endif
-endif
More information about the distro-pkg-dev
mailing list