rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-optflags.patch, 1.5, 1.6
Lillian Angel (langel)
fedora-extras-commits at redhat.com
Fri Apr 18 14:19:18 UTC 2008
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17714
Modified Files:
java-1.6.0-openjdk-optflags.patch
Log Message:
Fixed patch.
java-1.6.0-openjdk-optflags.patch:
Index: java-1.6.0-openjdk-optflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-optflags.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- java-1.6.0-openjdk-optflags.patch 8 Apr 2008 15:44:08 -0000 1.5
+++ java-1.6.0-openjdk-optflags.patch 18 Apr 2008 14:19:04 -0000 1.6
@@ -60,93 +60,73 @@
+ CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
+ CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
+ $(DEFINES) $(OPTIONS:%=-D%)
---- Makefile.am.orig 2008-04-08 11:35:27.000000000 -0400
-+++ Makefile.am 2008-04-08 11:36:57.000000000 -0400
-@@ -97,7 +97,8 @@
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+--- Makefile.am.orig 2008-04-18 10:06:32.000000000 -0400
++++ Makefile.am 2008-04-18 10:09:54.000000000 -0400
+@@ -98,6 +98,7 @@
"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
-- "FT2_LIB=$(FREETYPE2_LIBS)"
-+ "FT2_LIB=$(FREETYPE2_LIBS)" \
-+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)"
-
- if WITH_CACAO
- ICEDTEA_ENV += \
-@@ -152,7 +153,8 @@
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" \
++ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
+ "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
+ "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
+
+@@ -155,6 +156,7 @@
"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
-- "FT2_LIB=$(FREETYPE2_LIBS)"
-+ "FT2_LIB=$(FREETYPE2_LIBS)" \
-+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)"
-
- if WITH_CACAO
- ICEDTEA_ENV_ECJ += \
-@@ -289,6 +291,7 @@
- patches/icedtea-zero-build.patch \
- patches/icedtea-print-lsb-release.patch \
- patches/icedtea-jpegclasses.patch \
+ "FT2_LIB=$(FREETYPE2_LIBS)" \
++ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
+ "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
+ "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
+
+@@ -298,6 +300,7 @@
+ patches/icedtea-ia64-fdlibm.patch \
+ patches/icedtea-LCMS-setTagData.patch \
+ patches/icedtea-color-createcontext.patch \
+ patches/icedtea-optflags.patch \
- patches/icedtea-arm-uname.patch \
$(GCC_PATCH) \
$(FAST_BUILD_PATCH) \
---- Makefile.in.orig 2008-04-08 11:35:34.000000000 -0400
-+++ Makefile.in 2008-04-08 11:38:19.000000000 -0400
+ $(DISTRIBUTION_PATCHES)
+--- Makefile.in.orig 2008-04-18 10:06:37.000000000 -0400
++++ Makefile.in 2008-04-18 10:10:43.000000000 -0400
@@ -79,6 +79,7 @@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
+ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@
AMTAR = @AMTAR@
+ ANT = @ANT@
AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
-@@ -295,7 +296,8 @@
+@@ -299,7 +300,7 @@
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
-- "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1) $(am__append_2)
+- "FT2_LIB=$(FREETYPE2_LIBS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
-+ $(am__append_1) $(am__append_2)
-
- # OpenJDK ecj build environment.
- ICEDTEA_BUILD_DIR_ECJ = \
-@@ -332,7 +334,8 @@
+ "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
+ "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
+ $(am__append_2)
+@@ -339,7 +340,7 @@
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
-- "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_3) $(am__append_4)
+- "FT2_LIB=$(FREETYPE2_LIBS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
-+ $(am__append_3) $(am__append_4)
-
- # OpenJDK Source Preparation Targets
- # ==================================
-@@ -392,8 +395,9 @@
- patches/icedtea-zero-build.patch \
- patches/icedtea-print-lsb-release.patch \
- patches/icedtea-jpegclasses.patch \
-- patches/icedtea-arm-uname.patch $(GCC_PATCH) \
-- $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5)
-+ patches/icedtea-optflags.patch patches/icedtea-arm-uname.patch \
-+ $(GCC_PATCH) $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) \
-+ $(am__append_5)
+ "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
+ "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_3) \
+ $(am__append_4)
+@@ -405,7 +406,8 @@
+ patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
+ patches/icedtea-ia64-fdlibm.patch \
+ patches/icedtea-LCMS-setTagData.patch \
+- patches/icedtea-color-createcontext.patch $(GCC_PATCH) \
++ patches/icedtea-color-createcontext.patch \
++ patches/icedtea-optflags.patch $(GCC_PATCH) \
+ $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5)
# Patch OpenJDK for plug replacements and ecj.
- ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
---- configure.ac.orig 2008-04-08 11:35:42.000000000 -0400
-+++ configure.ac 2008-04-08 11:38:14.000000000 -0400
-@@ -28,6 +28,9 @@
- dnl check for it explicitly rather than using AC_PROG_AWK.
- FIND_TOOL([GAWK], [gawk])
-
-+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
-+AC_SUBST(ALT_OPT_CFLAGS)
-+
- AC_ARG_WITH([gcj-home],
- [AS_HELP_STRING([--with-gcj-home],
- [gcj home directory \
---- configure.orig 2008-04-08 11:35:48.000000000 -0400
-+++ configure 2008-04-08 11:38:17.000000000 -0400
-@@ -717,6 +717,7 @@
+--- configure.orig 2008-04-18 10:06:54.000000000 -0400
++++ configure 2008-04-18 10:10:32.000000000 -0400
+@@ -720,6 +720,7 @@
FASTJAR
ac_ct_FASTJAR
GAWK
@@ -154,7 +134,7 @@
SYSTEM_GCJ_DIR
SYSTEM_OPENJDK_DIR
SYSTEM_ICEDTEA_DIR
-@@ -5457,6 +5458,9 @@
+@@ -5790,6 +5791,9 @@
@@ -164,7 +144,7 @@
# Check whether --with-gcj-home was given.
if test "${with_gcj_home+set}" = set; then
-@@ -12581,6 +12585,7 @@
+@@ -12948,6 +12952,7 @@
FASTJAR!$FASTJAR$ac_delim
ac_ct_FASTJAR!$ac_ct_FASTJAR$ac_delim
GAWK!$GAWK$ac_delim
@@ -172,12 +152,24 @@
SYSTEM_GCJ_DIR!$SYSTEM_GCJ_DIR$ac_delim
SYSTEM_OPENJDK_DIR!$SYSTEM_OPENJDK_DIR$ac_delim
SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$ac_delim
-@@ -12663,7 +12668,7 @@
+@@ -13031,7 +13036,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+--- configure.ac.orig 2008-04-18 10:06:46.000000000 -0400
++++ configure.ac 2008-04-18 10:10:28.000000000 -0400
+@@ -31,6 +31,9 @@
+ dnl check for it explicitly rather than using AC_PROG_AWK.
+ FIND_TOOL([GAWK], [gawk])
+
++ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
++AC_SUBST(ALT_OPT_CFLAGS)
++
+ AC_ARG_WITH([gcj-home],
+ [AS_HELP_STRING([--with-gcj-home],
+ [gcj home directory \
More information about the fedora-extras-commits
mailing list