[java-1.7.0-openjdk/f18] Updated to icedtea7-forest 2.4.2
jiri vanek
jvanek at fedoraproject.org
Fri Sep 6 12:52:04 UTC 2013
commit 08703e1d7e4361d311dca5a71bd21ba1465c24c1
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date: Fri Sep 6 14:51:30 2013 +0200
Updated to icedtea7-forest 2.4.2
.gitignore | 1 +
aarch64.patch | 133 -----------------------------
java-1.7.0-openjdk-ppc-zero-hotspot.patch | 7 +-
java-1.7.0-openjdk-ppc-zero-jdk.patch | 14 +--
java-1.7.0-openjdk.spec | 19 ++--
sources | 2 +-
6 files changed, 18 insertions(+), 158 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 319d0be..169620a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
/openjdk-icedtea-2.3.11.tar.xz
/openjdk-icedtea-2.3.12.tar.xz
/openjdk-icedtea-2.4.1.tar.xz
+/openjdk-icedtea-2.4.2.tar.xz
diff --git a/java-1.7.0-openjdk-ppc-zero-hotspot.patch b/java-1.7.0-openjdk-ppc-zero-hotspot.patch
index 134dd26..7b6195b 100644
--- a/java-1.7.0-openjdk-ppc-zero-hotspot.patch
+++ b/java-1.7.0-openjdk-ppc-zero-hotspot.patch
@@ -1,11 +1,8 @@
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:01.000000000 -0400
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:00.000000000 -0400
-@@ -32,11 +32,11 @@
- //
-
+@@ -34,9 +34,9 @@
define_pd_global(bool, DontYieldALot, false);
--define_pd_global(intx, ThreadStackSize, 1536);
-+define_pd_global(intx, ThreadStackSize, 1664);
+ define_pd_global(intx, ThreadStackSize, 1664);
#ifdef _LP64
-define_pd_global(intx, VMThreadStackSize, 1024);
+define_pd_global(intx, VMThreadStackSize, 1664);
diff --git a/java-1.7.0-openjdk-ppc-zero-jdk.patch b/java-1.7.0-openjdk-ppc-zero-jdk.patch
index b51a6f6..6dfcbd5 100644
--- a/java-1.7.0-openjdk-ppc-zero-jdk.patch
+++ b/java-1.7.0-openjdk-ppc-zero-jdk.patch
@@ -1,29 +1,23 @@
--- openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400
+++ openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400
-@@ -83,9 +83,9 @@
+@@ -88,7 +88,7 @@
# 64-bit builds require a larger thread stack size.
ifeq ($(ARCH_DATA_MODEL), 32)
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152
else
-- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
-+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
endif
- JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
-
diff -up openjdk/corba/make/common/shared/Defs-java.gmk.ppc openjdk/corba/make/common/shared/Defs-java.gmk
--- openjdk/corba/make/common/shared/Defs-java.gmk.ppc 2012-03-24 11:44:34.450072733 +0100
+++ openjdk/corba/make/common/shared/Defs-java.gmk 2012-03-24 11:44:53.300073137 +0100
-@@ -79,9 +79,9 @@ JAVAC_JVM_FLAGS =
+@@ -79,7 +79,7 @@
# 64-bit builds require a larger thread stack size.
ifeq ($(ARCH_DATA_MODEL), 32)
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152
else
-- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536
-+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
endif
- JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
-
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 1c3e6de..2d217fa 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -1,7 +1,7 @@
# If debug is 1, OpenJDK is built with all debug info present.
%global debug 0
-%global icedtea_version 2.4.1
+%global icedtea_version 2.4.2
%global hg_tag icedtea-{icedtea_version}
%global accessmajorver 1.23
@@ -106,7 +106,7 @@
# Standard JPackage naming and versioning defines.
%global origin openjdk
-%global buildver 31
+%global buildver 60
# Keep priority on 6digits in case buildver>9
%global priority 1700%{buildver}
%global javaver 1.7.0
@@ -154,7 +154,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.4%{?dist}
+Release: %{icedtea_version}.0%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -268,8 +268,6 @@ Patch300: pulse-soundproperties.patch
#Workaround RH902004
Patch402: gstackbounds.patch
Patch403: PStack-808293.patch
-
-Patch404: aarch64.patch
# End of tmp patches
BuildRequires: autoconf
@@ -516,10 +514,6 @@ tar xzf %{SOURCE7}
%patch403
%endif
-%ifarch %{aarch64}
-%patch404 -p1
-%endif
-
%build
# How many cpu's do we have?
%ifarch aarch64
@@ -1151,6 +1145,13 @@ exit 0
%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
%changelog
+* Fri Sep 06 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.4.2.0.f18
+- updated to icedtea7-forest 2.4.2
+- removed upstreamed patch404 aarch64.patch
+- adapted patch104 java-1.7.0-openjdk-ppc-zero-jdk.patch
+- adapted patch105 java-1.7.0-openjdk-ppc-zero-hotspot.patch
+- buildver bumbed to 60
+
* Mon Sep 03 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.4.1.4.f18
- buildver bumbed to 31
- switched back to system lcms2
diff --git a/sources b/sources
index a0db13a..54ad99f 100644
--- a/sources
+++ b/sources
@@ -3,4 +3,4 @@ ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz
c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz
8eb5ad93dbf2f4fe86e52631969cfb09 systemtap-tapset.tar.gz
-65c2017ae277f6c29664bf91dfa99c42 openjdk-icedtea-2.4.1.tar.xz
+4bf2b37d85cf71fc3611aa772ffe1553 openjdk-icedtea-2.4.2.tar.xz
More information about the scm-commits
mailing list