/hg/release/icedtea6-1.13: 10 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Apr 15 01:02:41 UTC 2015
changeset 93b80a863f3d in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=93b80a863f3d
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Sun Jan 25 20:35:44 2015 +0000
Bump to next release, b35.
2015-01-25 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(OPENJDK_VERSION): Bump to next release, b35.
changeset b0b4ed5198cc in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=b0b4ed5198cc
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Apr 09 18:34:28 2015 +0100
Remove upstreamed patches and re-generate arch.patch.
2015-03-31 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch,
* patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch,
* patches/openjdk/oj51-pr2187-sync_4873188.patch,
* patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch,
* patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch,
* patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch:
Removed; upstreamed.
* Makefile.am:
(ICEDTEA_PATCHES): Remove above patches.
* patches/arch.patch: Regenerated following
upstream application of OPENJDK6-53.
changeset a5244371fdc8 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=a5244371fdc8
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Apr 09 18:39:41 2015 +0100
Remove upstreamed patches.
2015-04-09 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch,
* patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch,
* patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch:
Removed; upstreamed.
* Makefile.am:
(ICEDTEA_PATCHES): Remove above patches.
changeset 1345d074ce4c in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=1345d074ce4c
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Apr 09 03:44:56 2015 +0100
Update to build against April 2015 security fixes.
2015-04-09 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/g356743-libpng-1.5.patch:
Removed; applied upstream as part of S7088287.
* Makefile.am: Remove above patch.
* patches/openjdk/4963723-implement_sha-224.patch:
Drop copyright header change to RSASignature.java
as S8071726 upstream updates it to 2015.
changeset ec031d246b2c in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=ec031d246b2c
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Apr 09 20:00:59 2015 +0100
Update to b35 tarball.
2015-04-09 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(OPENJDK_DATE): Bump to security update release date;
14th of April, 2015.
(OPENJDK_SHA256SUM): Update for b35 tarball.
changeset c8862e8f297f in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=c8862e8f297f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Apr 09 20:20:00 2015 +0100
Update NEWS with b35 changes, set release date and bump to 1.13.7 final.
2015-04-09 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Update with changes from b35.
Set release date to 14th of April,
2015 for 1.13.7.
* configure.ac: Bump to 1.13.7.
changeset ac0650bb1c81 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=ac0650bb1c81
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Apr 10 18:24:49 2015 +0100
PR2294: Auto-generated jconsole.desktop and policytool.desktop should not be included in release tarball
2015-04-10 Andrew John Hughes <gnu.andrew at redhat.com>
PR2294: Auto-generated jconsole.desktop
and policytool.desktop should not be included
in release tarball
* Makefile.am:
(EXTRA_DIST): Remove jconsole.desktop and
policytool.desktop
* NEWS: Updated.
changeset 32d0b5a27dc2 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=32d0b5a27dc2
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 15 01:06:13 2015 +0100
Add CVE numbers to security issues for 1.13.7.
2015-04-15 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add CVE numbers.
changeset 69d82d8f85f9 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=69d82d8f85f9
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 15 01:07:09 2015 +0100
Correct 1.13.7 release date.
2015-04-15 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Correct 1.13.7 release date.
changeset 31107021b370 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=31107021b370
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 15 02:02:21 2015 +0100
Added tag icedtea6-1.13.7 for changeset 69d82d8f85f9
diffstat:
.hgtags | 1 +
ChangeLog | 69 +
Makefile.am | 17 +-
NEWS | 45 +-
configure.ac | 2 +-
patches/arch.patch | 421 ++++---
patches/g356743-libpng-1.5.patch | 26 -
patches/openjdk/4963723-implement_sha-224.patch | 7 -
patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch | 55 -
patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch | 522 ----------
patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch | 80 -
patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch | 106 --
patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch | 36 -
patches/openjdk/oj51-pr2187-sync_4873188.patch | 58 -
patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch | 73 -
patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch | 25 -
patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch | 15 -
17 files changed, 330 insertions(+), 1228 deletions(-)
diffs (truncated from 1699 to 500 lines):
diff -r d9bd9c11a6bc -r 31107021b370 .hgtags
--- a/.hgtags Thu Apr 09 17:12:59 2015 +0100
+++ b/.hgtags Wed Apr 15 02:02:21 2015 +0100
@@ -33,3 +33,4 @@
cbd687c7240d173b0b34840ba07a39a6e7b39a20 icedtea6-1.13.4
b2b4346dbdf5be3e9f8609e4a7e923f6557c19dd icedtea6-1.13.5
e6429eecdf6945c6a4b431049bcbf1834b255158 icedtea6-1.13.6
+69d82d8f85f926ca35e610d01727d223519c1c98 icedtea6-1.13.7
diff -r d9bd9c11a6bc -r 31107021b370 ChangeLog
--- a/ChangeLog Thu Apr 09 17:12:59 2015 +0100
+++ b/ChangeLog Wed Apr 15 02:02:21 2015 +0100
@@ -1,3 +1,72 @@
+2015-04-15 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Correct 1.13.7 release date.
+
+2015-04-15 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Add CVE numbers.
+
+2015-04-10 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR2294: Auto-generated jconsole.desktop
+ and policytool.desktop should not be included
+ in release tarball
+ * Makefile.am:
+ (EXTRA_DIST): Remove jconsole.desktop and
+ policytool.desktop
+ * NEWS: Updated.
+
+2015-04-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Update with changes from b35.
+ Set release date to 14th of April,
+ 2015 for 1.13.7.
+ * configure.ac: Bump to 1.13.7.
+
+2015-04-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_DATE): Bump to security update release date;
+ 14th of April, 2015.
+ (OPENJDK_SHA256SUM): Update for b35 tarball.
+
+2015-04-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/g356743-libpng-1.5.patch:
+ Removed; applied upstream as part of S7088287.
+ * Makefile.am: Remove above patch.
+ * patches/openjdk/4963723-implement_sha-224.patch:
+ Drop copyright header change to RSASignature.java
+ as S8071726 upstream updates it to 2015.
+
+2015-04-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch,
+ * patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch,
+ * patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch:
+ Removed; upstreamed.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove above patches.
+
+2015-03-31 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch,
+ * patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch,
+ * patches/openjdk/oj51-pr2187-sync_4873188.patch,
+ * patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch,
+ * patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch,
+ * patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch:
+ Removed; upstreamed.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove above patches.
+ * patches/arch.patch: Regenerated following
+ upstream application of OPENJDK6-53.
+
+2015-01-25 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b35.
+
2015-04-03 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r d9bd9c11a6bc -r 31107021b370 Makefile.am
--- a/Makefile.am Thu Apr 09 17:12:59 2015 +0100
+++ b/Makefile.am Wed Apr 15 02:02:21 2015 +0100
@@ -1,8 +1,8 @@
# Dependencies
-OPENJDK_DATE = 20_jan_2015
-OPENJDK_SHA256SUM = 13d1b4e1e152b6f9ad81b5558d6c7c0d3315a9e9494e49e515229722e2ee4e51
-OPENJDK_VERSION = b34
+OPENJDK_DATE = 14_apr_2015
+OPENJDK_SHA256SUM = 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b
+OPENJDK_VERSION = b35
OPENJDK_URL = https://java.net/downloads/openjdk6/
CACAO_VERSION = 68fe50ac34ec
@@ -410,7 +410,6 @@
patches/openjdk/7023591-AAShapePipe.patch \
patches/openjdk/7027667-AAShapePipeRegTest.patch \
patches/openjdk/7019861-AA-regression-fix.patch \
- patches/g356743-libpng-1.5.patch \
patches/openjdk/6986968-crash_on_xim_restart.patch \
patches/openjdk/7036754-stroker-nan.patch \
patches/openjdk/pgram-pipe-regression.patch \
@@ -595,19 +594,10 @@
patches/pr1904-icedtea_and_distro_versioning.patch \
patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch \
patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch \
- patches/openjdk/8020190-pr2174-jfieldid_must_match_object.patch \
- patches/openjdk/8028623-pr2177-hash_code_mismatch_for_extended_characters.patch \
- patches/openjdk/8061785-pr2177-test_bug-corrupted_utf8_character.patch \
patches/pr2070-type_punning_warnings.patch \
patches/pr2082-s390_type_fixes.patch \
patches/pr2096-4096-bit_dh.patch \
patches/pr2179-avoid_x86_workaround_on_zero.patch \
- patches/openjdk/6730740-pr2186-64-bit_breakage_in_6729881.patch \
- patches/openjdk/oj51-pr2187-sync_4873188.patch \
- patches/openjdk/7031830-pr2183-bad_record_mac_failure.patch \
- patches/openjdk/oj52-pr2185-no_serbia_montenegro.patch \
- patches/openjdk/oj53-pr2181-strict_aliasing_on_ppc32.patch \
- patches/openjdk/oj54-pr2182-6911104_reintroduces_test_fragment.patch \
patches/openjdk/6584008-pr2195-jvmtistringprimitivecallback_null_string.patch \
patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch \
patches/openjdk/8074312-pr2255-support_linux_4.patch \
@@ -944,7 +934,6 @@
$(top_srcdir)/patches/* \
contrib arm_port \
overlays \
- jconsole.desktop policytool.desktop \
$(JTREG_SRCS) HACKING pulseaudio \
hotspot.map \
autogen.sh \
diff -r d9bd9c11a6bc -r 31107021b370 NEWS
--- a/NEWS Thu Apr 09 17:12:59 2015 +0100
+++ b/NEWS Wed Apr 15 02:02:21 2015 +0100
@@ -12,17 +12,54 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.13.7 (2015-04-XX):
-
- * Backports
+New in release 1.13.7 (2015-04-14):
+
+* Security fixes
+ - S8059064: Better G1 log caching
+ - S8060461: Fix for JDK-8042609 uncovers additional issue
+ - S8064601, CVE-2015-0480: Improve jar file handling
+ - S8065286: Fewer subtable substitutions
+ - S8065291: Improved font lookups
+ - S8066479: Better certificate chain validation
+ - S8067050: Better font consistency checking
+ - S8067684: Better font substitutions
+ - S8067699, CVE-2015-0469: Better glyph storage
+ - S8068320, CVE-2015-0477: Limit applet requests
+ - S8068720, CVE-2015-0488: Better certificate options checking
+ - S8069198: Upgrade image library
+ - S8071726, CVE-2015-0478: Better RSA optimizations
+ - S8071818: Better vectorization on SPARC
+ - S8071931, CVE-2015-0460: Return of the phantom menace
+* Import of OpenJDK6 b35
+ - OJ55: Synchronise whitespace in TimeZoneNames files with OpenJDK 7 versions.
+ - OJ56: Update 3rd party readme and license for LibPNG v 1.6.16
+ - OJ57: Remove mistakenly added patching fragment
+ - S6672144: HttpURLConnection.getInputStream sends POST request after failed chunked
+ - S6989721: awt native code compiler warnings
+ - S7088287: libpng need to be updated.
+ - S7090424: TestGlyphVectorLayout failed automately with java.lang.StackOverflowError
+ - S7170655: Frame size does not follow font size change with XToolkit
+ - S7176479: G1: JVM crashes on T5-8 system with 1.5 TB heap
+ - S8019623: Lack of synchronization in AppContext.getAppContext()
+ - S8040790: [TEST_BUG] tools/javac/innerClassFile/Driver.sh fails to cleanup files after it
+ - S8043123: Hard crash with access violation exception when blitting to very large image
+ - S8051359: JPopupMenu creation in headless mode with JDK9b23 causes NPE
+ - S8064454: [TEST_BUG] Test tools/javac/innerClassFile/Driver.sh fails for Mac and Linux
+ - S8065072: sun/net/www/http/HttpClient/StreamingRetry.java failed intermittently
+ - S8065709: Deadlock in awt/logging apparently introduced by 8019623
+ - S8072042: (tz) Support tzdata2015a
+ - S8074662: Update 3rd party readme and license for LibPNG v 1.6.16
+ - S8075211: [TEST_BUG] Test sun/net/www/http/HttpClient/StreamingRetry.java fails with compilation error
+* Backports
- S6584008, PR2195, RH1173326: jvmtiStringPrimitiveCallback should not be invoked when string value is null
- S7199862, PR2198: Make sure that a connection is still alive when retrieved from KeepAliveCache in certain cases
- S8074312, PR2255: Enable hotspot builds on Linux 4.x
- * Bug fixes
+* Bug fixes
- PR2197: jhat man page has broken URL
- PR2201: Support giflib 5.1.0
- PR2211: DGifCloseFile call should check the return value, not the error code, for failure
- PR2226: giflib 5.1 conditional excludes 6.0, 7.0, etc.
+ - PR2294: Auto-generated jconsole.desktop and policytool.desktop should not be included in release tarball
New in release 1.13.6 (2015-01-23):
diff -r d9bd9c11a6bc -r 31107021b370 configure.ac
--- a/configure.ac Thu Apr 09 17:12:59 2015 +0100
+++ b/configure.ac Wed Apr 15 02:02:21 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.13.7pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.13.7],[distro-pkg-dev at openjdk.java.net])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
diff -r d9bd9c11a6bc -r 31107021b370 patches/arch.patch
--- a/patches/arch.patch Thu Apr 09 17:12:59 2015 +0100
+++ b/patches/arch.patch Wed Apr 15 02:02:21 2015 +0100
@@ -1,7 +1,216 @@
---- openjdk/jdk/make/javax/sound/SoundDefs.gmk.orig 2008-10-15 17:04:19.000000000 +0200
-+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2008-10-15 17:09:56.000000000 +0200
+diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
+--- openjdk.orig/corba/make/common/Defs-linux.gmk 2010-05-26 09:31:18.000000000 +0100
++++ openjdk/corba/make/common/Defs-linux.gmk 2015-03-31 16:43:11.850271287 +0100
+@@ -92,9 +92,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
++CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_hppa +=
+ CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_m68k +=
++CFLAGS_REQUIRED_mips +=
++CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_ppc += -m32
++CFLAGS_REQUIRED_ppc64 += -m64
++CFLAGS_REQUIRED_s390 +=
++CFLAGS_REQUIRED_s390x += -m64
+ CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
+ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
+diff -Nru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk
+--- openjdk.orig/corba/make/common/shared/Platform.gmk 2015-03-31 15:23:48.410803372 +0100
++++ openjdk/corba/make/common/shared/Platform.gmk 2015-03-31 16:43:11.850271287 +0100
+@@ -220,9 +220,40 @@
+ else
+ # i586 is 32-bit, amd64 is 64-bit
+ ifndef ARCH_DATA_MODEL
++ ifeq ($(ARCH), alpha)
++ ARCH_DATA_MODEL=64
++ endif
++ ifeq ($(ARCH), amd64)
++ ARCH_DATA_MODEL=64
++ endif
++ ifeq ($(ARCH), arm)
++ ARCH_DATA_MODEL=32
++ endif
+ ifeq ($(ARCH), i586)
+ ARCH_DATA_MODEL=32
+- else
++ endif
++ ifeq ($(ARCH), ia64)
++ ARCH_DATA_MODEL=64
++ endif
++ ifeq ($(ARCH), m68k)
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), mips)
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), mipsel)
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), ppc)
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), ppc64)
++ ARCH_DATA_MODEL=64
++ endif
++ ifeq ($(ARCH), s390)
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), s390x)
+ ARCH_DATA_MODEL=64
+ endif
+ endif
+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 2015-02-05 18:49:58.372812460 +0000
++++ openjdk/jdk/make/common/Defs-linux.gmk 2015-03-31 16:45:47.396086418 +0100
+@@ -102,10 +102,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
++CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_hppa +=
+ CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+-CFLAGS_REQUIRED_ppc += -fsigned-char -D_BIG_ENDIAN
++CFLAGS_REQUIRED_m68k +=
++CFLAGS_REQUIRED_mips +=
++CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_ppc += -m32 -fsigned-char -D_BIG_ENDIAN
++CFLAGS_REQUIRED_ppc64 += -m64
++CFLAGS_REQUIRED_s390 +=
++CFLAGS_REQUIRED_s390x += -m64
+ CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
+ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
+diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
+--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2015-03-31 15:23:48.254801559 +0100
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2015-03-31 16:51:56.332405289 +0100
+@@ -70,28 +70,56 @@
+ else
+ CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
+ endif
+- ifneq ("$(findstring sparc,$(ARCH))", "")
+- # sparc or sparcv9
+- REQUIRED_CC_VER = 4.0
+- REQUIRED_GCC_VER = 4.0.*
+- else
+- ifeq ($(ARCH_DATA_MODEL), 32)
++ ifeq ($(ARCH), alpha)
++ # alpha
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifeq ($(ARCH), amd64)
++ # amd64
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifeq ($(ARCH), arm)
++ # arm
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifeq ($(ARCH), i586)
+ # i586
+ REQUIRED_CC_VER = 3.2
+ REQUIRED_GCC_VER = 3.2.1*
+ REQUIRED_GCC_VER_INT = 3.2.1-7a
+- else
+- ifeq ($(ARCH), amd64)
+- # amd64
+- REQUIRED_CC_VER = 3.2
+- REQUIRED_GCC_VER = 3.2.*
+ endif
+ ifeq ($(ARCH), ia64)
+ # ia64
+ REQUIRED_CC_VER = 3.2
+ REQUIRED_GCC_VER = 2.9[56789].*
+ endif
++ ifneq ("$(findstring m68k,$(ARCH))", "")
++ # m68k
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifneq ("$(findstring mips,$(ARCH))", "")
++ # mips
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifneq ("$(findstring ppc,$(ARCH))", "")
++ # ppc or ppc64
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
+ endif
++ ifneq ("$(findstring s390,$(ARCH))", "")
++ # s390 or s390x
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifneq ("$(findstring sparc,$(ARCH))", "")
++ # sparc or sparcv9
++ REQUIRED_CC_VER = 4.0
++ REQUIRED_GCC_VER = 4.0.*
+ endif
+ # Option used to create a shared library
+ SHARED_LIBRARY_FLAG = -shared
+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2015-03-31 15:23:48.410803372 +0100
++++ openjdk/jdk/make/common/shared/Platform.gmk 2015-03-31 16:43:11.850271287 +0100
+@@ -222,9 +222,40 @@
+ else
+ # i586 is 32-bit, amd64 is 64-bit
+ ifndef ARCH_DATA_MODEL
++ ifeq ($(ARCH), alpha)
++ ARCH_DATA_MODEL=64
++ endif
++ ifeq ($(ARCH), amd64)
++ ARCH_DATA_MODEL=64
++ endif
++ ifeq ($(ARCH), arm)
++ ARCH_DATA_MODEL=32
++ endif
+ ifeq ($(ARCH), i586)
+ ARCH_DATA_MODEL=32
+- else
++ endif
++ ifeq ($(ARCH), ia64)
++ ARCH_DATA_MODEL=64
++ endif
++ ifeq ($(ARCH), m68k)
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), mips)
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), mipsel)
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), ppc)
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), ppc64)
++ ARCH_DATA_MODEL=64
++ endif
++ ifeq ($(ARCH), s390)
++ ARCH_DATA_MODEL=32
++ endif
++ ifeq ($(ARCH), s390x)
+ ARCH_DATA_MODEL=64
+ endif
+ endif
+diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk
+--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2013-08-21 20:32:57.524222927 +0100
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2015-03-31 16:44:39.367291058 +0100
@@ -58,10 +58,54 @@
- ifdef ICEDTEA_ZERO_BUILD
+ ifeq ($(ZERO_BUILD), true)
CPPFLAGS += -DX_ARCH=X_ZERO
else
+ ifeq ($(ARCH), alpha)
@@ -66,143 +275,9 @@
endif
---- openjdk/jdk/make/common/Defs-linux.gmk.orig 2008-10-15 17:04:21.000000000 +0200
-+++ openjdk/jdk/make/common/Defs-linux.gmk 2008-10-15 17:08:37.000000000 +0200
-@@ -102,9 +102,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
-+CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
-+CFLAGS_REQUIRED_hppa +=
- CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
- CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-+CFLAGS_REQUIRED_m68k +=
-+CFLAGS_REQUIRED_mips +=
-+CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN
-+CFLAGS_REQUIRED_ppc += -m32
-+CFLAGS_REQUIRED_ppc64 += -m64
-+CFLAGS_REQUIRED_s390 +=
-+CFLAGS_REQUIRED_s390x += -m64
- CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
- LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
- CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
---- openjdk/jdk/make/common/shared/Compiler-gcc.gmk.orig 2008-10-15 17:04:19.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2008-10-15 17:11:28.000000000 +0200
-@@ -70,28 +70,56 @@
- else
- CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
- endif
-- ifneq ("$(findstring sparc,$(ARCH))", "")
-- # sparc or sparcv9
-- REQUIRED_CC_VER = 4.0
-- REQUIRED_GCC_VER = 4.0.*
-- else
-- ifeq ($(ARCH_DATA_MODEL), 32)
-- # i586
-+ ifeq ($(ARCH), alpha)
-+ # alpha
- REQUIRED_CC_VER = 3.2
-- REQUIRED_GCC_VER = 3.2.1*
-- REQUIRED_GCC_VER_INT = 3.2.1-7a
-- else
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
- ifeq ($(ARCH), amd64)
- # amd64
- REQUIRED_CC_VER = 3.2
- REQUIRED_GCC_VER = 3.2.*
- endif
-+ ifeq ($(ARCH), arm)
-+ # arm
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.*
-+ endif
-+ ifeq ($(ARCH), i586)
-+ # i586
-+ REQUIRED_CC_VER = 3.2
-+ REQUIRED_GCC_VER = 3.2.1*
-+ REQUIRED_GCC_VER_INT = 3.2.1-7a
-+ endif
- ifeq ($(ARCH), ia64)
- # ia64
- REQUIRED_CC_VER = 3.2
- REQUIRED_GCC_VER = 2.9[56789].*
- endif
-+ ifneq ("$(findstring m68k,$(ARCH))", "")
-+ # m68k
-+ REQUIRED_CC_VER = 3.2
More information about the distro-pkg-dev
mailing list