[java-1.6.0-openjdk/f15/master] fixed optflags patch

jiri vanek jvanek at fedoraproject.org
Fri Mar 25 14:24:51 UTC 2011


commit 2ea2443ee4a67e48b0712f8e40306f17882352bc
Author: Jiri Vanek <jvanek at dhcp-2-137.brq.redhat.com>
Date:   Fri Mar 25 15:20:49 2011 +0100

    fixed optflags patch

 java-1.6.0-openjdk-optflags.patch |   12 ++++++------
 java-1.6.0-openjdk.spec           |    3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/java-1.6.0-openjdk-optflags.patch b/java-1.6.0-openjdk-optflags.patch
index 749c129..95037f0 100644
--- a/java-1.6.0-openjdk-optflags.patch
+++ b/java-1.6.0-openjdk-optflags.patch
@@ -1,12 +1,12 @@
---- configacorig	2008-08-05 10:16:04.000000000 -0400
-+++ configure.ac	2008-08-05 10:16:15.000000000 -0400
-@@ -9,6 +9,9 @@
+--- configure.ac	2011-03-02 19:34:58.692136324 +0100
++++ configure.ac	2011-03-25 14:56:40.798290097 +0100
+@@ -18,6 +18,9 @@
  AC_PROG_CC
  AC_PROG_CXX
  
 +ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
 +AC_SUBST(ALT_OPT_CFLAGS)
 +
- FIND_TOOL([MAKE], [make])
- FIND_TOOL([GZIP], [gzip])
- FIND_TOOL([ANT], [ant])
+ IT_FIND_TOOL([MAKE], [make])
+ IT_FIND_TOOL([GZIP], [gzip])
+ IT_FIND_TOOL([ANT], [ant])
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index cdc8f67..0891393 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -169,7 +169,7 @@ Source10: %{jaxwsurl}jdk6-jaxws-b20.zip
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
-#Patch0:   java-1.6.0-openjdk-optflags.patch
+Patch0:   java-1.6.0-openjdk-optflags.patch
 Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
 Patch2:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
 Patch3:	  java-1.6.0-openjdk-java-access-bridge-security.patch
@@ -891,6 +891,7 @@ exit 0
 -added newest hotspot 20
 -bumped to openjdk b22
 -added  makefile-xalan-deps.patch to sutisfy xalan dependencies.
+-fixed patch0
 
 * Tue Feb 15 2011 Deepak Bhole <dbhole at redhat.com> 1:1.6.0.0-52.1.9.7
 - Updated to IcedTea6 1.9.7


More information about the scm-commits mailing list