[java-1.7.0-openjdk] update paths in the ppc patches, add missing snippet
Dan Horák
sharkcz at fedoraproject.org
Sat Mar 24 15:29:28 UTC 2012
commit 478f3368414187dfafde82cc8dcee47d41711d2a
Author: Dan Horák <dan at danny.cz>
Date: Sat Mar 24 16:29:24 2012 +0100
update paths in the ppc patches, add missing snippet
java-1.7.0-openjdk-ppc-zero-hotspot.patch | 4 ++--
java-1.7.0-openjdk-ppc-zero-jdk.patch | 19 +++++++++++++++++--
java-1.7.0-openjdk.spec | 5 ++++-
3 files changed, 23 insertions(+), 5 deletions(-)
---
diff --git a/java-1.7.0-openjdk-ppc-zero-hotspot.patch b/java-1.7.0-openjdk-ppc-zero-hotspot.patch
index 351d459..f7e49bc 100644
--- a/java-1.7.0-openjdk-ppc-zero-hotspot.patch
+++ b/java-1.7.0-openjdk-ppc-zero-hotspot.patch
@@ -1,5 +1,5 @@
---- old/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:01.000000000 -0400
-+++ new/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:00.000000000 -0400
+--- 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 @@
//
diff --git a/java-1.7.0-openjdk-ppc-zero-jdk.patch b/java-1.7.0-openjdk-ppc-zero-jdk.patch
index 15290a9..b51a6f6 100644
--- a/java-1.7.0-openjdk-ppc-zero-jdk.patch
+++ b/java-1.7.0-openjdk-ppc-zero-jdk.patch
@@ -1,5 +1,5 @@
---- old/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400
-+++ new/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
++++ openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400
@@ -83,9 +83,9 @@
# 64-bit builds require a larger thread stack size.
@@ -12,3 +12,18 @@
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 =
+
+ # 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
+ 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 6abaea8..4b74955 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -164,7 +164,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}%{?dist}.3
+Release: %{icedtea_version}%{?dist}.4
# 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
@@ -1397,6 +1397,9 @@ exit 0
%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
%changelog
+* Sat Mar 24 2012 Dan Horák <dan[at]danny.cz>> - 1.7.0.3-2.1.fc17.4
+- update paths in the ppc patches, add missing snippet
+
* Wed Mar 21 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.3
- Reverted fix for rhbz#740762
- Fixed PPC/PPC64 build (rh804136) -- added patches from Chris Phillips
More information about the scm-commits
mailing list