[java-1.7.0-openjdk/f18] - updated to icedtea 2.4, removed bootstrap (bootstrap*.patch and javac-wrapper), sync with f19 (add
jiri vanek
jvanek at fedoraproject.org
Mon Sep 2 14:14:59 UTC 2013
commit 1744ee45ad5360f8587fe6938c4f76b6f4f75812
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date: Mon Sep 2 16:13:40 2013 +0200
- updated to icedtea 2.4, removed bootstrap (bootstrap*.patch and javac-wrapper), sync with f19 (added PStack-808293.patch aarch64.patch), temporarily disabled arm32 support (will need duplicated source tarball based on 3.x or deeper fix for 2.4.x)
- added java-1.7.0-openjdk-doNotUseDisabledEcc.patch
- deleted usptreamed 657854-openjdk7.patch
- deleted usptreamed callerclass-01.patch
- deleted usptreamed callerclass-02.patch
- deleted usptreamed callerclass-03.patch
- deleted usptreamed callerclass-04.patch
- deleted usptreamed systemtap.patch
- added new file fsg.sh - to celan up sources
- adapted aarch64.patch
- adapted gstackbounds.patch
- adapted java-1.7.0-openjdk-disable-system-lcms.patch
- adapted java-1.7.0-openjdk-java-access-bridge-security.patch
- adapted java-1.7.0-openjdk-ppc-zero-hotspot.patch
- adapted java-1.7.0-openjdk-size_t.patch
- adapted java-1.7.0-openjdk.spec
- adapted rhino.patch
.gitignore | 1 +
657854-openjdk7.patch | 29 -
PStack-808293.patch | 40 +
aarch64.patch | 133 +
bootstrap-ant-javac.patch | 26 -
bootstrap-break-processbuilder-dependency.patch | 136 -
bootstrap-corba-defs.patch | 35 -
bootstrap-corba-dependencies.patch | 39 -
bootstrap-corba-idlj.patch | 98 -
bootstrap-corba-no-gen.patch | 12 -
bootstrap-corba-orb.patch | 42 -
bootstrap-demos.patch | 32 -
bootstrap-ecj-autoboxing.patch | 287 -
bootstrap-ecj-diamond.patch | 5797 --------------------
bootstrap-ecj-fphexconstants.patch | 60 -
bootstrap-ecj-multicatch.patch | 115 -
bootstrap-ecj-opts.patch | 12 -
bootstrap-ecj-stringswitch.patch | 303 -
bootstrap-ecj-trywithresources.patch | 928 ----
bootstrap-fontconfig.patch | 16 -
bootstrap-generated-comments.patch | 21 -
bootstrap-genstubs-nofork.patch | 12 -
bootstrap-hotspot-jdk-dependency.patch | 25 -
bootstrap-icedteart.patch | 41 -
bootstrap-jar.patch | 43 -
bootstrap-javah-xbootclasspath.patch | 12 -
bootstrap-javah.patch | 92 -
bootstrap-jaxp-dependency.patch | 25 -
bootstrap-jaxws-jdk-dependency.patch | 43 -
bootstrap-jaxws-langtools-dependency.patch | 48 -
bootstrap-jopt.patch | 26 -
bootstrap-langtools-force-old-jdk.patch | 16 -
bootstrap-pr40188.patch | 15 -
bootstrap-revert-6941137.patch | 12 -
bootstrap-revert-6973616.patch | 12 -
bootstrap-symbols.patch | 23 -
bootstrap-test_gamma.patch | 46 -
bootstrap-tobin.patch | 39 -
bootstrap-tools.jar.patch | 14 -
bootstrap-xbootclasspath.patch | 120 -
bootstrap-xsltproc.patch | 54 -
callerclass-01.patch | 76 -
callerclass-02.patch | 161 -
callerclass-03.patch | 40 -
callerclass-04.patch | 117 -
fsg.sh | 115 +
gstackbounds.patch | 9 +-
java-1.7.0-openjdk-disable-system-lcms.patch | 24 +-
java-1.7.0-openjdk-doNotUseDisabledEcc.patch | 26 +
...1.7.0-openjdk-java-access-bridge-security.patch | 25 +-
java-1.7.0-openjdk-ppc-zero-hotspot.patch | 1 -
java-1.7.0-openjdk-size_t.patch | 40 +-
java-1.7.0-openjdk.spec | 401 +--
javac-wrapper | 61 -
rhino.patch | 4 +-
sources | 3 +-
systemtap.patch | 140 -
57 files changed, 441 insertions(+), 9682 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b46b1dc..319d0be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
/openjdk-icedtea-2.3.10.tar.xz
/openjdk-icedtea-2.3.11.tar.xz
/openjdk-icedtea-2.3.12.tar.xz
+/openjdk-icedtea-2.4.1.tar.xz
diff --git a/PStack-808293.patch b/PStack-808293.patch
new file mode 100644
index 0000000..4637403
--- /dev/null
+++ b/PStack-808293.patch
@@ -0,0 +1,40 @@
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java 2012-04-06 02:26:33.322164601 +0200
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java 2012-04-06 02:26:57.958514071 +0200
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, Red Hat Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -84,7 +85,8 @@
+ out.print("----------------- ");
+ out.print(th);
+ out.println(" -----------------");
+- while (f != null) {
++ int maxStack = 256;
++ while (f != null && maxStack-- > 0) {
+ ClosestSymbol sym = f.closestSymbolToPC();
+ Address pc = f.pc();
+ out.print(pc + "\t");
+@@ -158,10 +160,19 @@
+ printUnknown(out);
+ }
+ }
++ Address oldPC = f.pc();
++ Address oldFP = f.localVariableBase();
+ f = f.sender(th);
++ if (f != null
++ && oldPC.equals(f.pc())
++ && oldFP.equals(f.localVariableBase())) {
++ // We didn't make any progress
++ f = null;
++ }
+ }
+ } catch (Exception exp) {
+- exp.printStackTrace();
++ // exp.printStackTrace();
++ out.println("bad stack: " + exp);
+ // continue, may be we can do a better job for other threads
+ }
+ if (isJava && concurrentLocks) {
diff --git a/aarch64.patch b/aarch64.patch
new file mode 100644
index 0000000..91a99bf
--- /dev/null
+++ b/aarch64.patch
@@ -0,0 +1,133 @@
+diff --git a/openjdk/corba/make/common/shared/Defs-java.gmk b/openjdk/corba/make/common/shared/Defs-java.gmk
+index f45a7a1..45ebe30 100644
+--- a/openjdk/corba/make/common/shared/Defs-java.gmk
++++ b/openjdk/corba/make/common/shared/Defs-java.gmk
+@@ -81,7 +81,7 @@ JAVAC_JVM_FLAGS =
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ else
+- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
++ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
+ endif
+ JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
+
+diff --git a/openjdk/hotspot/src/os/linux/vm/os_linux.cpp b/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+index 2cb95f0..730dfd3 100644
+--- a/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
++++ b/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -387,7 +387,7 @@ void os::init_system_properties_values() {
+ * ...
+ * 7: The default directories, normally /lib and /usr/lib.
+ */
+-#if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390))
++#if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390) || defined(AARCH64))
+ #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
+ #else
+ #define DEFAULT_LIBPATH "/lib:/usr/lib"
+@@ -5393,8 +5393,12 @@ int os::fork_and_exec(char* cmd) {
+ // separate process to execve. Make a direct syscall to fork process.
+ // On IA64 there's no fork syscall, we have to use fork() and hope for
+ // the best...
++#ifdef __aarch64__
++ pid_t pid = vfork();
++#else
+ pid_t pid = NOT_IA64(syscall(__NR_fork);)
+ IA64_ONLY(fork();)
++#endif
+
+ if (pid < 0) {
+ // fork failed
+diff --git a/openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp b/openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
+index d952cb7..57c4900 100644
+--- a/openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
++++ b/openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
+@@ -32,7 +32,7 @@
+ //
+
+ define_pd_global(bool, DontYieldALot, false);
+-define_pd_global(intx, ThreadStackSize, 1536);
++define_pd_global(intx, ThreadStackSize, 1664);
+ #ifdef _LP64
+ define_pd_global(intx, VMThreadStackSize, 1024);
+ #else
+diff --git a/openjdk/hotspot/src/share/vm/utilities/macros.hpp b/openjdk/hotspot/src/share/vm/utilities/macros.hpp
+index 5950702..2db1334 100644
+--- a/openjdk/hotspot/src/share/vm/utilities/macros.hpp
++++ b/openjdk/hotspot/src/share/vm/utilities/macros.hpp
+@@ -260,6 +260,14 @@
+ #define NOT_ARM(code) code
+ #endif
+
++#ifdef AARCH64
++#define AARCH64_ONLY(code) code
++#define NOT_AARCH64(code)
++#else
++#define AARCH64_ONLY(code)
++#define NOT_AARCH64(code) code
++#endif
++
+ #ifdef JAVASE_EMBEDDED
+ #define EMBEDDED_ONLY(code) code
+ #define NOT_EMBEDDED(code)
+diff --git a/openjdk/jdk/make/common/shared/Defs-java.gmk b/openjdk/jdk/make/common/shared/Defs-java.gmk
+index 986bea6..d0b5659 100644
+--- a/openjdk/jdk/make/common/shared/Defs-java.gmk
++++ b/openjdk/jdk/make/common/shared/Defs-java.gmk
+@@ -90,7 +90,7 @@ JAVAC_JVM_FLAGS =
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ else
+- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
++ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
+ endif
+ JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
+
+diff --git a/openjdk/jdk/make/javax/sound/SoundDefs.gmk b/openjdk/jdk/make/javax/sound/SoundDefs.gmk
+index 0bb59e1..16650ea 100644
+--- a/openjdk/jdk/make/javax/sound/SoundDefs.gmk
++++ b/openjdk/jdk/make/javax/sound/SoundDefs.gmk
+@@ -118,6 +118,10 @@ else
+ CPPFLAGS += -DX_ARCH=X_SPARCV9
+ endif # ARCH sparcv9
+
++ ifeq ($(ARCH), aarch64)
++ CPPFLAGS += -DX_ARCH=X_AARCH64
++ endif # ARCH aarch64
++
+ ifeq ($(ARCH), amd64)
+ CPPFLAGS += -DX_ARCH=X_AMD64
+ endif # ARCH amd64
+diff --git a/openjdk/jdk/make/jdk_generic_profile.sh b/openjdk/jdk/make/jdk_generic_profile.sh
+index 7e0b8de..d27129f 100644
+--- a/openjdk/jdk/make/jdk_generic_profile.sh
++++ b/openjdk/jdk/make/jdk_generic_profile.sh
+@@ -269,7 +269,7 @@ if [ "${ZERO_BUILD}" = true ] ; then
+ i386|ppc|s390|sparc|arm|sh)
+ ARCH_DATA_MODEL=32
+ ;;
+- amd64|ppc64|s390x|sparcv9|ia64|alpha)
++ amd64|ppc64|s390x|sparcv9|ia64|alpha|aarch64)
+ ARCH_DATA_MODEL=64
+ ;;
+ *)
+@@ -280,7 +280,7 @@ if [ "${ZERO_BUILD}" = true ] ; then
+
+ # ZERO_ENDIANNESS is the endianness of the processor
+ case "${ZERO_LIBARCH}" in
+- i386|amd64|ia64)
++ i386|amd64|ia64|aarch64)
+ ZERO_ENDIANNESS=little
+ ;;
+ ppc*|s390*|sparc*|alpha)
+diff --git a/openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h b/openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+index ff6729f..9c5ddf6 100644
+--- a/openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
++++ b/openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+@@ -51,6 +51,7 @@
+ #define X_S390 14
+ #define X_S390X 15
+ #define X_SH 16
++#define X_AARCH64 17
+
+ // **********************************
+ // Make sure you set X_PLATFORM and X_ARCH defines correctly.
diff --git a/fsg.sh b/fsg.sh
new file mode 100644
index 0000000..062ffd4
--- /dev/null
+++ b/fsg.sh
@@ -0,0 +1,115 @@
+#!/bin/sh
+
+echo "Further liberating OpenJDK..."
+
+# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
+# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
+
+# PR146/S6713083
+# Remove binaries
+rm -vf \
+ openjdk/jdk/test/sun/management/windows/revokeall.exe \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
+
+rm -vf \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \
+ openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so
+
+rm -vf \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.exe \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.sh \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \
+
+# Remove test sources with questionable license headers.
+rm -vf \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
+ openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
+ openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
+ openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
+ openjdk/jdk/test/java/util/Locale/LocaleTest.java \
+ openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
+ openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
+ openjdk/jdk/test/sun/text/resources/LocaleDataTest.java
+
+# Remove J2DBench sources, some of which have questionable license
+# headers.
+rm -rvf \
+ openjdk/jdk/src/share/demo/java2d/J2DBench
+
+# BEGIN Debian/Ubuntu additions
+
+# binary files
+rm -vf \
+ openjdk/jdk/test/sun/net/idn/nfscis.spp
+
+# TODO
+#$ find openjdk -name '*.jar' -o -name '*.class'|grep -v test
+
+# PR140, S6695776
+# Also see patches/icedtea-jscheme.patch
+rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib
+rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts
+
+# PR139, S6710791
+rm -vf \
+ openjdk/hotspot/agent/kk/src/share/lib/maf-1_0.jar \
+ openjdk/hotspot/agent/kk/src/share/lib/jlfgr-1_0.jar \
+
+# END Debian/Ubuntu additions
+
+echo "Removing support for proprietary SNMP plug"
+rm -rvf openjdk/jdk/src/share/classes/sun/management/snmp
+rm -rvf openjdk/jdk/src/share/classes/com/sun/jmx/snmp
+rm -rvf openjdk/jdk/test/com/sun/jmx/snmp
+
+echo "Removing registration tests"
+rm -rvf openjdk/jdk/test/com/sun/servicetag
+
+echo "Removing EC source code we don't build"
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDSASignature.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java
+rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunECEntries.java
+rm -rvf openjdk/jdk/src/share/native/sun/security/ec
+rm -rvf openjdk/jdk/make/sun/security/ec
diff --git a/gstackbounds.patch b/gstackbounds.patch
index a579dcd..39a066a 100644
--- a/gstackbounds.patch
+++ b/gstackbounds.patch
@@ -80,11 +80,10 @@ diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp
--- openjdk/hotspot/src/share/vm/runtime/os.cpp
+++ openjdk/hotspot/src/share/vm/runtime/os.cpp
-@@ -1331,41 +1331,3 @@
- }
+@@ -1353,43 +1353,6 @@
return result;
}
--
+
-// Read file line by line, if line is longer than bsize,
-// skip rest of line.
-int os::get_line_chars(int fd, char* buf, const size_t bsize){
@@ -122,6 +121,10 @@ diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp
-
- return (int) i;
-}
+
+ void os::SuspendedThreadTask::run() {
+ assert(Threads_lock->owned_by_self() || (_thread == VMThread::vm_thread()), "must have threads lock to call this");
+
diff --git a/src/share/vm/runtime/os.hpp b/src/share/vm/runtime/os.hpp
--- openjdk/hotspot/src/share/vm/runtime/os.hpp
+++ openjdk/hotspot/src/share/vm/runtime/os.hpp
diff --git a/java-1.7.0-openjdk-disable-system-lcms.patch b/java-1.7.0-openjdk-disable-system-lcms.patch
index b0e8a3c..ef43cc7 100644
--- a/java-1.7.0-openjdk-disable-system-lcms.patch
+++ b/java-1.7.0-openjdk-disable-system-lcms.patch
@@ -1,9 +1,8 @@
-diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
---- openjdk/jdk/make/jdk_generic_profile.sh.sav 2012-03-19 17:33:21.147566973 -0400
-+++ openjdk/jdk/make/jdk_generic_profile.sh 2012-03-19 17:33:32.877391463 -0400
-@@ -381,24 +381,6 @@ if [ "${ZERO_BUILD}" = true ] ; then
- fi
- fi
+--- openjdk/jdk/make/jdk_generic_profile.sh.sav
++++ openjdk/jdk/make/jdk_generic_profile.sh
+@@ -399,23 +399,6 @@
+ export ZLIB_CFLAGS
+ export ZLIB_LIBS
-# Export variables for system LCMS
-# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
@@ -22,15 +21,14 @@ diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generi
-fi
-export LCMS_CFLAGS
-export LCMS_LIBS
--
- # Export variables for system zlib
- # ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
- # link against zlib
-@@ -452,7 +434,6 @@ fi
- export GIF_LIBS
+
+ # Export variables for system jpeg
+ # JPEG_CFLAGS and JPEG_LIBS tell the compiler how to compile and
+@@ -463,7 +446,6 @@
+ fi
# IcedTea defaults; use system libraries
-export USE_SYSTEM_LCMS=true
- export USE_SYSTEM_ZLIB=true
+ export SYSTEM_ZLIB=true
export USE_SYSTEM_JPEG=true
export USE_SYSTEM_PNG=true
diff --git a/java-1.7.0-openjdk-doNotUseDisabledEcc.patch b/java-1.7.0-openjdk-doNotUseDisabledEcc.patch
new file mode 100644
index 0000000..54d374d
--- /dev/null
+++ b/java-1.7.0-openjdk-doNotUseDisabledEcc.patch
@@ -0,0 +1,26 @@
+diff -up openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java.sav openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java
+--- openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java.sav 2013-01-14 12:04:57.096097896 -0500
++++ openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java 2013-01-14 12:05:14.956835554 -0500
+@@ -120,20 +120,8 @@ public class AlgorithmId implements Seri
+ try {
+ algParams = AlgorithmParameters.getInstance(algidString);
+ } catch (NoSuchAlgorithmException e) {
+- try {
+- // Try the internal EC code so that we can fully parse EC
+- // keys even if the provider is not registered.
+- // This code can go away once we have EC in the SUN provider.
+- algParams = AlgorithmParameters.getInstance(algidString,
+- sun.security.ec.ECKeyFactory.ecInternalProvider);
+- } catch (NoSuchAlgorithmException ee) {
+- /*
+- * This algorithm parameter type is not supported, so we cannot
+- * parse the parameters.
+- */
+- algParams = null;
+- return;
+- }
++ algParams = null;
++ return;
+ }
+ // Decode (parse) the parameters
+ algParams.init(params.toByteArray());
diff --git a/java-1.7.0-openjdk-java-access-bridge-security.patch b/java-1.7.0-openjdk-java-access-bridge-security.patch
index 22deefc..6b4224b 100644
--- a/java-1.7.0-openjdk-java-access-bridge-security.patch
+++ b/java-1.7.0-openjdk-java-access-bridge-security.patch
@@ -1,25 +1,24 @@
-diff -up openjdk/jdk/src/share/lib/security/java.security.sav openjdk/jdk/src/share/lib/security/java.security
---- openjdk/jdk/src/share/lib/security/java.security.sav 2013-02-01 17:34:10.750939826 -0500
-+++ openjdk/jdk/src/share/lib/security/java.security 2013-02-01 17:36:09.283198885 -0500
-@@ -148,7 +148,9 @@
- com.sun.org.apache.xml.internal.utils.,\
+--- openjdk/jdk/src/share/lib/security/java.security-linux.orig
++++ openjdk/jdk/src/share/lib/security/java.security-linux
+@@ -154,7 +154,9 @@
com.sun.org.apache.xml.internal.security.,\
com.sun.org.glassfish.,\
-- org.jcp.xml.dsig.internal.
-+ org.jcp.xml.dsig.internal.,\
+ org.jcp.xml.dsig.internal.,\
+- oracle.jrockit.jfr.
++ oracle.jrockit.jfr.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.
-
#
# List of comma-separated packages that start with or equal this string
-@@ -185,7 +187,9 @@
- com.sun.org.apache.xml.internal.utils.,\
+ # will cause a security exception to be thrown when
+@@ -192,7 +194,9 @@
com.sun.org.apache.xml.internal.security.,\
com.sun.org.glassfish.,\
-- org.jcp.xml.dsig.internal.
-+ org.jcp.xml.dsig.internal.,\
+ org.jcp.xml.dsig.internal.,\
+- oracle.jrockit.jfr.
++ oracle.jrockit.jfr.,\
+ org.GNOME.Accessibility.,\
+ org.GNOME.Bonobo.
-
#
# Determines whether this properties file can be appended to
+ # or overridden on the command line via -Djava.security.properties
diff --git a/java-1.7.0-openjdk-ppc-zero-hotspot.patch b/java-1.7.0-openjdk-ppc-zero-hotspot.patch
index 80c9b94..134dd26 100644
--- a/java-1.7.0-openjdk-ppc-zero-hotspot.patch
+++ b/java-1.7.0-openjdk-ppc-zero-hotspot.patch
@@ -15,4 +15,3 @@
#endif // _LP64
define_pd_global(intx, CompilerThreadStackSize, 0);
define_pd_global(uintx, JVMInvokeMethodSlack, 8192);
-
diff --git a/java-1.7.0-openjdk-size_t.patch b/java-1.7.0-openjdk-size_t.patch
index 554ec92..f9bfc20 100644
--- a/java-1.7.0-openjdk-size_t.patch
+++ b/java-1.7.0-openjdk-size_t.patch
@@ -46,34 +46,34 @@ diff -up openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/comp
diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2012-03-09 16:30:30.426921691 -0500
-@@ -543,7 +543,7 @@
- #endif // _MSC_VER
-
- uint ConcurrentMark::scale_parallel_threads(uint n_par_threads) {
-- return MAX2((n_par_threads + 2) / 4, 1U);
-+ return MAX2((size_t)((n_par_threads + 2) / 4), (size_t)1);
- }
-
- ConcurrentMark::ConcurrentMark(ReservedSpace rs,
-@@ -571,7 +571,7 @@
+@@ -481,7 +481,7 @@ ConcurrentMark::ConcurrentMark(ReservedS
_regionStack(),
// _finger set in set_non_marking_state
-- _max_task_num(MAX2((uint)ParallelGCThreads, 1U)),
+- _max_task_num(MAX2(ParallelGCThreads, (size_t)1)),
+ _max_task_num(MAX2((size_t)ParallelGCThreads, (size_t)1)),
// _active_tasks set in set_non_marking_state
// _tasks set inside the constructor
_task_queues(new CMTaskQueueSet((int) _max_task_num)),
-@@ -1318,7 +1318,7 @@
- assert(parallel_marking_threads() <= max_parallel_marking_threads(),
- "Maximum number of marking threads exceeded");
+@@ -586,7 +586,7 @@ ConcurrentMark::ConcurrentMark(ReservedS
+ _sleep_factor = sleep_factor;
+ _marking_task_overhead = marking_task_overhead;
+ } else {
+- _parallel_marking_threads = MAX2((ParallelGCThreads + 2) / 4, (size_t)1);
++ _parallel_marking_threads = MAX2((size_t)((ParallelGCThreads + 2) / 4), (size_t)1);
+ _sleep_factor = 0.0;
+ _marking_task_overhead = 1.0;
+ }
+@@ -1116,7 +1116,7 @@ void ConcurrentMark::markFromRoots() {
-- uint active_workers = MAX2(1U, parallel_marking_threads());
-+ size_t active_workers = MAX2((size_t) 1, (size_t)parallel_marking_threads());
+ _restart_for_overflow = false;
- // Parallel task terminator is set in "set_phase()"
+- size_t active_workers = MAX2((size_t) 1, parallel_marking_threads());
++ size_t active_workers = MAX2((size_t) 1, (size_t)parallel_marking_threads());
+ force_overflow_conc()->init();
set_phase(active_workers, true /* concurrent */);
-@@ -4515,7 +4515,7 @@
+
+@@ -3689,7 +3689,7 @@ void CMTask::drain_local_queue(bool part
// of things to do) or totally (at the very end).
size_t target_size;
if (partially) {
@@ -82,11 +82,11 @@ diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sa
} else {
target_size = 0;
}
-@@ -5438,7 +5438,7 @@
+@@ -4604,7 +4604,7 @@ size_t G1PrintRegionLivenessInfoClosure:
// The > 0 check is to deal with the prev and next live bytes which
// could be 0.
if (*hum_bytes > 0) {
-- bytes = MIN2(HeapRegion::GrainBytes, *hum_bytes);
+- bytes = MIN2((size_t) HeapRegion::GrainBytes, *hum_bytes);
+ bytes = MIN2((size_t) HeapRegion::GrainBytes, (size_t)*hum_bytes);
*hum_bytes -= bytes;
}
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 173832d..e33ee0f 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -1,12 +1,7 @@
-# If gcjbootstrap is 1 OpenJDK is bootstrapped against
-# java-1.5.0-gcj-devel. If gcjbootstrap is 0 OpenJDK is built against
-# java-1.6.0-openjdk-devel.
-%global gcjbootstrap 0
-
# If debug is 1, OpenJDK is built with all debug info present.
%global debug 0
-%global icedtea_version 2.3.12
+%global icedtea_version 2.4.1
%global hg_tag icedtea-{icedtea_version}
%global accessmajorver 1.23
@@ -179,7 +174,7 @@ URL: http://openjdk.java.net/
#head
#REPO=http://icedtea.classpath.org/hg/icedtea7-forest
#current release
-#REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3
+#REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4
# hg clone $REPO/ openjdk -r %{hg_tag}
# hg clone $REPO/corba/ openjdk/corba -r %{hg_tag}
# hg clone $REPO/hotspot/ openjdk/hotspot -r %{hg_tag}
@@ -188,6 +183,7 @@ URL: http://openjdk.java.net/
# hg clone $REPO/jdk/ openjdk/jdk -r %{hg_tag}
# hg clone $REPO/langtools/ openjdk/langtools -r %{hg_tag}
# find openjdk -name ".hg" -exec rm -rf '{}' \;
+# sh /git/java-1.7.0-openjdk/fX/fsg.sh
# tar cJf openjdk-icedtea-%{icedtea_version}.tar.xz openjdk
Source0: openjdk-icedtea-%{icedtea_version}.tar.xz
@@ -199,21 +195,9 @@ Source1: %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2
# This source is under maintainer's/java-team's control
Source2: README.src
-# javac wrapper (used during bootstrap to strip what ecj doesn't support)
-# This source is under manual control of maintainer/java-team
-Source3: javac-wrapper
-
-
# Sources 6-12 are taken from hg clone http://icedtea.classpath.org/hg/icedtea7
# Unless said differently, there is directory with required sources which should be enough to pack/rename
-# Auto-generated files (used only in bootstrap)
-# To reproduce:
-# build OpenJDK7 tarball above with any JDK
-# mv generated.build generated
-# tar czf generated-files.tar.gz generated
-Source4: generated-files.tar.gz
-
# Class rewrite to rewrite rhino hierarchy
Source5: class-rewriter.tar.gz
@@ -270,125 +254,13 @@ Patch105: %{name}-ppc-zero-hotspot.patch
Patch106: %{name}-freetype-check-fix.patch
+#do not used disbaled ecc
+Patch112: %{name}-doNotUseDisabledEcc.patch
+
# allow to create hs_pid.log in tmp (in 700 permissions) if working directory is unwritable
Patch107: abrt_friendly_hs_log_jdk7.patch
#
-# Bootstrap patches (code with this is never shipped)
-#
-
-# Explicitly set javac, so that the bootstrap version is used
-Patch200: bootstrap-ant-javac.patch
-
-# Adjusted generated sources path to use prebuilt ones
-Patch201: bootstrap-corba-defs.patch
-
-# Do not use idlj to generate sources, as we use prebuilt ones
-Patch202: bootstrap-corba-idlj.patch
-
-# Disable decending into sources dir for generation
-Patch203: bootstrap-corba-no-gen.patch
-
-# Explicitly compile ORB.java
-Patch204: bootstrap-corba-orb.patch
-
-# Don't build demos in bootstrap
-Patch205: bootstrap-demos.patch
-
-# Change hex constants to be numbers instead of 0x... so that ecj can compile them right
-Patch206: bootstrap-ecj-fphexconstants.patch
-
-# Adjust opt flags to remove what ecj doesn't support
-Patch207: bootstrap-ecj-opts.patch
-
-# use pre-generated font config files
-Patch208: bootstrap-fontconfig.patch
-
-# Don't write auto-generation message in bootstrap
-Patch209: bootstrap-generated-comments.patch
-
-# Adjust bootclasspath to match what ecj has
-Patch210: bootstrap-xbootclasspath.patch
-
-# Wire in icedtea rt.jar (FIXME: name needs update, kept same for now to match icedtea name)
-Patch211: bootstrap-icedteart.patch
-
-# Wire in custom compiles rt classes
-Patch212: bootstrap-jar.patch
-
-# Compile inner opengl class explicitly
-Patch213: bootstrap-javah.patch
-
-# Disable ct.sym creation for bootstrap
-Patch214: bootstrap-symbols.patch
-
-# Disable icon generation for bootstrap
-Patch215: bootstrap-tobin.patch
-
-# Don't run test_gamma
-Patch216: bootstrap-test_gamma.patch
-
-# Disable requirement of module_lib path which bootstrap java_home doesn't have
-Patch217: bootstrap-tools.jar.patch
-
-# Allow -J opts to jar only if jar knows of them
-Patch218: bootstrap-jopt.patch
-
-# Explicitly add jaxp classes to classpath
-Patch219: bootstrap-jaxp-dependency.patch
-
-# Don't fork when generating stubs
-Patch220: bootstrap-genstubs-nofork.patch
-
-# Remove dependency on ProcessBuilder which is package private to Oracle implementation
-Patch221: bootstrap-break-processbuilder-dependency.patch
-
-# Allow to build with 1.5
-Patch222: bootstrap-revert-6973616.patch
-
-# Avoid trying to load system zone info provider and failing
-Patch223: bootstrap-revert-6941137.patch
-
-# Replace usage of string switch with if/elseif/else
-Patch224: bootstrap-ecj-stringswitch.patch
-
-# Allow langtools to use older jdk
-Patch225: bootstrap-langtools-force-old-jdk.patch
-
-# Access JDK sources and classes from langtools build
-Patch226: bootstrap-corba-dependencies.patch
-
-# Access langtools classes for Javadoc
-Patch227: bootstrap-jaxws-langtools-dependency.patch
-
-# Access JDK sources for com.sun.net.httpserver
-Patch228: bootstrap-jaxws-jdk-dependency.patch
-
-# Access JDK and generated sources to build servicability agent
-Patch229: bootstrap-hotspot-jdk-dependency.patch
-
-# Remove use of multi-catch and replace with regular multi-level catch
-Patch230: bootstrap-ecj-multicatch.patch
-
-# Remove use of try-with-resources and replace with manual close
-Patch231: bootstrap-ecj-trywithresources.patch
-
-# Disable auto-boxing and manally cast
-Patch232: bootstrap-ecj-autoboxing.patch
-
-# Use custom xslt processor
-Patch233: bootstrap-xsltproc.patch
-
-# Use constants from interface rather than impl
-Patch234: bootstrap-pr40188.patch
-
-# Remove use of diamond operator and replace with manual
-Patch235: bootstrap-ecj-diamond.patch
-
-# Adjust javah switches to only use what bootstrap version supports
-Patch236: bootstrap-javah-xbootclasspath.patch
-
-#
# Optional component packages
#
@@ -396,21 +268,12 @@ Patch236: bootstrap-javah-xbootclasspath.patch
# mixer
Patch300: pulse-soundproperties.patch
-# SystemTap support
-# Workaround for RH613824
-Patch302: systemtap.patch
-
-#Workaround RH947731
-Patch401: 657854-openjdk7.patch
#Workaround RH902004
Patch402: gstackbounds.patch
-# End of tmp patches
+Patch403: PStack-808293.patch
-# Patches already upstream but not in a release yet
-Patch501: callerclass-01.patch
-Patch502: callerclass-02.patch
-Patch503: callerclass-03.patch
-Patch504: callerclass-04.patch
+Patch404: aarch64.patch
+# End of tmp patches
BuildRequires: autoconf
BuildRequires: automake
@@ -439,11 +302,7 @@ BuildRequires: zip
BuildRequires: fontconfig
BuildRequires: xorg-x11-fonts-Type1
BuildRequires: zlib > 1.2.3-6
-%if %{gcjbootstrap}
-BuildRequires: java-1.5.0-gcj-devel
-%else
BuildRequires: java-1.7.0-openjdk-devel
-%endif
BuildRequires: fontconfig
# Java Access Bridge for GNOME build requirements.
BuildRequires: at-spi-devel
@@ -585,8 +444,6 @@ The OpenJDK API documentation.
cp %{SOURCE2} .
# OpenJDK patches
-
-# Rhino patch -- one default version (100) and one specific to 2.1.1 (400)
%patch100
# pulseaudio support
@@ -596,7 +453,6 @@ cp %{SOURCE2} .
# Add systemtap patches if enabled
%if %{with_systemtap}
-%patch302
%endif
# Remove libraries that are linked
@@ -605,9 +461,6 @@ sh %{SOURCE10}
# Copy jaxp, jaf and jaxws drops
mkdir drops/
-# Extract the generated files
-tar xzf %{SOURCE4}
-
# Extract the rewriter (to rewrite rhino classes)
tar xzf %{SOURCE5}
@@ -636,99 +489,59 @@ tar xzf %{SOURCE9}
# Extract desktop files
tar xzf %{SOURCE7}
-# If bootstrapping, apply additional patches
-%if %{gcjbootstrap}
-
-cp -a openjdk openjdk-boot
-
-# Add bootstrap patches
-%patch200
-%patch201
-%patch202
-%patch203
-%patch204
-%patch205
-%patch206
-%patch207
-%patch208
-%patch209
-%patch210
-%patch211
-%patch212
-%patch213
-%patch214
-%patch215
-%patch216
-%patch217
-%patch218
-%patch219
-%patch220
-%patch221
-%patch222
-%patch223
-%patch224
-%patch225
-%patch226
-%patch227
-%patch228
-%patch229
-%patch230
-%patch231
-%patch232
-%patch233
-%patch234
-%patch235
-%patch236
-
-%endif
-
-%patch501
-%patch502
-%patch503
-%patch504
-
-%build
-# How many cpu's do we have?
-export NUM_PROC=`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :`
-export NUM_PROC=${NUM_PROC:-1}
-
-# Build IcedTea and OpenJDK.
-%ifarch s390x sparc64 alpha ppc64
-export ARCH_DATA_MODEL=64
-%endif
-%ifarch alpha
-export CFLAGS="$CFLAGS -mieee"
-%endif
-
-patch -l -p0 < %{PATCH3}
-patch -l -p0 < %{PATCH4}
+%patch3
+%patch4
%if %{debug}
-patch -l -p0 < %{PATCH5}
-patch -l -p0 < %{PATCH6}
+%patch5
+%patch6
%endif
# Type fixes for s390
%ifarch s390 s390x
-patch -l -p0 < %{PATCH101}
-patch -l -p0 < %{PATCH102}
+%patch101
+%patch102
%endif
# Disable system LCMS2
-patch -l -p0 < %{PATCH500}
+%patch500
-patch -l -p0 < %{PATCH106}
-patch -l -p0 < %{PATCH107}
+%patch106
+%patch107
%ifarch ppc ppc64
# PPC fixes
-patch -l -p0 < %{PATCH104}
-patch -l -p0 < %{PATCH105}
+%patch104
+%patch105
%endif
-patch -l -p0 < %{PATCH401}
%ifarch %{jit_arches}
-patch -l -p0 < %{PATCH402}
+%patch402
+%patch403
+%endif
+
+%ifarch %{aarch64}
+%patch404 -p1
+%endif
+
+%patch112
+
+%build
+# How many cpu's do we have?
+%ifarch aarch64
+# temporary until real hardware lands
+export NUM_PROC=1
+%else
+export NUM_PROC=`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :`
+export NUM_PROC=${NUM_PROC:-1}
+%endif
+
+# Build IcedTea and OpenJDK.
+%ifarch s390x sparc64 alpha %{power64} %{aarch64}
+export ARCH_DATA_MODEL=64
+%endif
+%ifarch alpha
+export CFLAGS="$CFLAGS -mieee"
%endif
# Build the re-written rhino jar
@@ -763,102 +576,9 @@ java -cp rewriter com.redhat.rewriter.ClassRewriter \
jar cfm ../rhino.jar META-INF/MANIFEST.MF sun
)
-%if %{gcjbootstrap}
-
-mkdir -p bootstrap/boot
-
-# Copy over JAVA_HOME from /usr/lib/jvm/java-gcj/
-cp -aL %{_jvmdir}/java-gcj/* bootstrap/boot/ || : # broken symlinks can be non-fatal but may cause this to fail
-
-# Replace javac with a wrapper that does some magic
-cp -af %{SOURCE3} bootstrap/boot/bin/javac
-chmod u+x bootstrap/boot/bin/javac # SOURCE3 may not be +x
-sed -i -e s:@RT_JAR@:$PWD/bootstrap/boot/jre/lib/rt.jar:g bootstrap/boot/bin/javac
-
-# Link the native2ascii binary
-ln -sf /usr/bin/gnative2ascii bootstrap/boot/bin/native2ascii
-
-# We don't need a disassebler, fake it
-echo "#!/bin/sh
-exit 0" > bootstrap/boot/bin/javap
-chmod u+rx bootstrap/boot/bin/javap # We need to run this during build
-
-# Modules directory
-mkdir -p bootstrap/boot/lib/modules
-
-# jdk1.6.0 link
-rm -f bootstrap/jdk1.6.0
-ln -sf boot bootstrap/jdk1.6.0
-
-# Update rt.jar with newer classes
-# Extra classes to compile for reasons like
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42003
-echo "openjdk-boot/jdk/src/share/classes/java/util/regex/Matcher.java
-openjdk-boot/jdk/src/share/classes/javax/management/remote/JMXServiceURL.java
-openjdk-boot/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanInfo.java
-openjdk-boot/jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java
-openjdk-boot/langtools/src/share/classes/javax/tools/JavaFileManager.java" > rt-source-files
-
-mkdir -p rt
-bootstrap/jdk1.6.0/bin/javac -g -encoding utf-8 -source 6 -target 6 -d rt \
- -classpath %{_jvmdir}/java-gcj/jre/lib/rt.jar \
- -sourcepath 'generated:openjdk-boot/jdk/src/share/classes:openjdk-boot/jdk/src/solaris/classes:openjdk-boot/langtools/src/share/classes:openjdk-boot/corba/src/share/classes' \
- -bootclasspath "\'\'" @rt-source-files
-
-pushd rt
-zip -qur ../bootstrap/jdk1.6.0/jre/lib/rt.jar *
-popd
-
-# clean up
-rm -f rt-source-files
-rm -rf rt
-
-# Build it
-pushd openjdk-boot
-cp -a ../generated generated.build
-chmod u+rwx generated.build
-
-export ALT_DROPS_DIR=$PWD/../drops
-export ALT_JDK_IMPORT_PATH="$PWD/../bootstrap/jdk1.6.0"
-
-# Set generic profile
-source jdk/make/jdk_generic_profile.sh
-
-make \
- ANT="/usr/bin/ant" \
- ALT_BOOTDIR="$PWD/../bootstrap/jdk1.6.0" \
- ICEDTEA_RT="$PWD/../bootstrap/jdk1.6.0/jre/lib/rt.jar" \
- HOTSPOT_BUILD_JOBS="$NUM_PROC" \
- NO_DOCS="true" \
- RHINO_JAR="$PWD/../rhino/rhino.jar" \
- GENSRCDIR="$PWD/generated.build" \
- DISABLE_NIMBUS="true" \
- XSLT="/usr/bin/xsltproc" \
- FT2_CFLAGS="-I/usr/include/freetype2 " \
- FT2_LIBS="-lfreetype " \
-%ifnarch %{jit_arches}
- LIBFFI_CFLAGS="`pkg-config --cflags libffi` " \
- LIBFFI_LIBS="-lffi " \
- ZERO_BUILD="true" \
- ZERO_LIBARCH="%{archbuild}" \
- ZERO_ARCHDEF="%{archdef}" \
-%ifarch ppc ppc64 s390 s390x
- ZERO_ENDIANNESS="big" \
-%else
- ZERO_ENDIANNESS="little" \
-%endif
-%endif
- %{nil}
-
-export JDK_TO_BUILD_WITH=$PWD/build/linux-%{archbuild}/j2sdk-image
-
-popd
-
-%else
-
export JDK_TO_BUILD_WITH=/usr/lib/jvm/java-openjdk
-%endif
+
pushd openjdk >& /dev/null
@@ -875,6 +595,8 @@ source jdk/make/jdk_generic_profile.sh
umask $oldumask
make \
+ DISABLE_INTREE_EC=true \
+ UNLIMITED_CRYPTO=true \
ANT="/usr/bin/ant" \
DISTRO_NAME="Fedora" \
DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch}" \
@@ -1333,6 +1055,8 @@ exit 0
%{jvmjardir}
%dir %{_jvmdir}/%{jredir}/lib/security
%{_jvmdir}/%{jredir}/lib/security/cacerts
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%config(noreplace) %{_jvmdir}/%{jredir}/lib/logging.properties
@@ -1428,6 +1152,29 @@ exit 0
%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
%changelog
+* Mon Sep 02 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.4.1.1.f18
+- removed bootstrap (bootstrap*.patch and javac-wrapper)
+- updated to icedtea 2.4
+ - added java-1.7.0-openjdk-doNotUseDisabledEcc.patch
+ - deleted usptreamed 657854-openjdk7.patch
+ - deleted usptreamed callerclass-01.patch
+ - deleted usptreamed callerclass-02.patch
+ - deleted usptreamed callerclass-03.patch
+ - deleted usptreamed callerclass-04.patch
+ - deleted usptreamed systemtap.patch
+ - added new file fsg.sh - to celan up sources
+ - adapted aarch64.patch
+ - adapted gstackbounds.patch
+ - adapted java-1.7.0-openjdk-disable-system-lcms.patch
+ - adapted java-1.7.0-openjdk-java-access-bridge-security.patch
+ - adapted java-1.7.0-openjdk-ppc-zero-hotspot.patch
+ - adapted java-1.7.0-openjdk-size_t.patch
+ - adapted java-1.7.0-openjdk.spec
+ - adapted rhino.patch
+- temporarily disabled arm32 support (will need duplicated source tarball based
+ on 3.x or deeper fix for 2.4.x)
+- added PStack-808293.patch aarch64.patch (sync with f19)
+
* Mon Aug 26 2013 Omair Majid <omajid at redhat.com> - 1.7.0.23-2.3.12.3.f18
- getCallerClass patches should be applied unconditionally.
diff --git a/rhino.patch b/rhino.patch
index 0af9a3c..3c11620 100644
--- a/rhino.patch
+++ b/rhino.patch
@@ -19,8 +19,8 @@ diff -ur openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefil
SUBDIRS_desktop = image
SUBDIRS_enterprise = crypto/provider jndi \
org rowset net/httpserver
--SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo
-+SUBDIRS_misc = script tracing servicetag nio demo
+-SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing nio demo
++SUBDIRS_misc = script tracing nio demo
# Omit mirror since it's built with the apt tool.
SUBDIRS_tools = tools
diff --git a/sources b/sources
index e1292ed..a0db13a 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,6 @@
ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz
200676ae97998b6f5bc18ff77e35d222 desktop-files.tar.gz
-868ff2d4457d1a2dccfa465fb8220e1c generated-files.tar.gz
c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz
8eb5ad93dbf2f4fe86e52631969cfb09 systemtap-tapset.tar.gz
-8d4f3df0b264c331187696bb49306634 openjdk-icedtea-2.3.12.tar.xz
+65c2017ae277f6c29664bf91dfa99c42 openjdk-icedtea-2.4.1.tar.xz
More information about the scm-commits
mailing list