rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-optflags.patch, 1.7, 1.8
Lillian Angel (langel)
fedora-extras-commits at redhat.com
Mon May 5 14:40:49 UTC 2008
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25916
Modified Files:
java-1.6.0-openjdk-optflags.patch
Log Message:
Updated optflags 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- java-1.6.0-openjdk-optflags.patch 28 Apr 2008 14:26:51 -0000 1.7
+++ java-1.6.0-openjdk-optflags.patch 5 May 2008 14:40:13 -0000 1.8
@@ -1,170 +1,32 @@
---- openjdkold/icedtea6/patches/icedtea-optflags.patch 1969-12-31 19:00:00.000000000 -0500
-+++ patches/icedtea-optflags.patch 2008-04-01 08:41:47.000000000 -0400
-@@ -0,0 +1,59 @@
-+--- oldopenjdk/hotspot/src/share/vm/libadt/port.hpp 2008-02-28 05:02:37.000000000 -0500
-++++ openjdk/hotspot/src/share/vm/libadt/port.hpp 2008-03-14 16:21:10.000000000 -0400
-+@@ -39,8 +39,8 @@
-+ #include <string.h>
-+ #undef bzero
-+ inline void bzero(void *b, int len) { memset(b,0,len); }
-+-#undef bcopy
-+-inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
-++//#undef bcopy
-++//inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
-+ #undef bcmp
-+ inline int bcmp(const void *s,const void *t,int len) { return memcmp(s,t,len);}
-+ extern "C" unsigned long strtoul(const char *s, char **end, int base);
-+--- oldopenjdk/hotspot/build/linux/makefiles/rules.make 2008-03-19 01:02:55.000000000 -0400
-++++ openjdk/hotspot/build/linux/makefiles/rules.make 2008-03-19 10:47:33.000000000 -0400
-+@@ -37,8 +37,8 @@
-+ DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
-+
-+ # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++).
-+-C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
-+-CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS)
-++C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(ALT_OPT_CFLAGS)
-++CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS) $(ALT_OPT_CFLAGS)
-+
-+ AS.S = $(AS) $(ASFLAGS)
-+
-+--- oldopenjdk/hotspot/agent/src/os/linux/Makefile 2008-03-19 01:02:55.000000000 -0400
-++++ openjdk/hotspot/agent/src/os/linux/Makefile 2008-03-19 10:58:51.000000000 -0400
-+@@ -40,7 +40,7 @@
-+
-+ LIBS = -lthread_db
-+
-+-CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
-++CFLAGS = -c $(ALT_OPT_CFLAGS) -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
-+
-+ LIBSA = $(ARCH)/libsaproc.so
-+
-+--- oldopenjdk/corba/make/common/Defs.gmk 2008-02-28 05:04:22.000000000 -0500
-++++ openjdk/corba/make/common/Defs.gmk 2008-03-19 11:37:33.000000000 -0400
-+@@ -444,7 +444,7 @@
-+ # Tool flags
-+ #
-+ ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS)
-+-CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS)
-++CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(ALT_OPT_CFLAGS)
-+ CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
-+ CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
-+ $(DEFINES) $(OPTIONS:%=-D%)
-+--- oldopenjdk/jdk/make/common/Defs.gmk 2008-03-19 01:02:55.000000000 -0400
-++++ openjdk/jdk/make/common/Defs.gmk 2008-03-19 11:38:19.000000000 -0400
-+@@ -664,7 +664,7 @@
-+ # Tool flags
-+ #
-+ ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS)
-+-CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS)
-++CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(ALT_OPT_CFLAGS)
-+ CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
-+ CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
-+ $(DEFINES) $(OPTIONS:%=-D%)
---- Makefile.am.orig 2008-04-28 10:02:57.000000000 -0400
-+++ Makefile.am 2008-04-28 10:03:58.000000000 -0400
-@@ -96,6 +96,7 @@
- "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
- "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
-+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
- "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)" \
- "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-@@ -159,6 +160,7 @@
- "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
- "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
-+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
- "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)" \
- "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-@@ -308,6 +310,7 @@
- patches/icedtea-color-createcontext.patch \
- patches/icedtea-color-profiles.patch \
- patches/icedtea-fonts.patch \
-+ patches/icedtea-optflags.patch \
- $(GCC_PATCH) \
- $(DISTRIBUTION_PATCHES)
-
---- Makefile.in.orig 2008-04-28 10:03:03.000000000 -0400
-+++ Makefile.in 2008-04-28 10:04:59.000000000 -0400
-@@ -87,6 +87,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@
-@@ -306,6 +307,7 @@
- "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
- "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
-+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
- "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)" \
- "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-@@ -346,6 +348,7 @@
- "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
- "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
-+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
- "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)" \
- "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-@@ -411,8 +414,8 @@
- patches/icedtea-LCMS-setTagData.patch \
- patches/icedtea-color-createcontext.patch \
- patches/icedtea-color-profiles.patch \
-- patches/icedtea-fonts.patch $(GCC_PATCH) \
-- $(DISTRIBUTION_PATCHES) $(am__append_7)
-+ patches/icedtea-fonts.patch patches/icedtea-optflags.patch \
-+ $(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
-
- # Patch OpenJDK for plug replacements and ecj.
- ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
---- configure.ac.orig 2008-04-28 10:03:16.000000000 -0400
-+++ configure.ac 2008-04-28 10:04:44.000000000 -0400
-@@ -22,6 +22,10 @@
- FIND_TOOL([UNZIP], [unzip])
- FIND_TOOL([CPIO], [cpio])
- FIND_TOOL([FILE], [file])
-+
-+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
-+AC_SUBST(ALT_OPT_CFLAGS)
-+
- AC_CHECK_TOOLS([FASTJAR], [fastjar jar])
- if test "x$FASTJAR" = x; then
- AC_MSG_ERROR([Can't find fastjar or jar])
---- configure.orig 2008-04-28 10:03:09.000000000 -0400
-+++ configure 2008-04-28 10:04:48.000000000 -0400
-@@ -717,6 +717,7 @@
- UNZIP
- CPIO
+--- configure.orig 2008-05-05 10:37:01.000000000 -0400
++++ configure 2008-05-05 10:38:35.000000000 -0400
+@@ -719,6 +719,7 @@
FILE
-+ALT_OPT_CFLAGS
FASTJAR
ac_ct_FASTJAR
++ALT_OPT_CFLAGS
GAWK
-@@ -5569,6 +5570,10 @@
- fi
-
+ SYSTEM_GCJ_DIR
+ SYSTEM_OPENJDK_DIR
+@@ -5673,6 +5674,10 @@
+ fi
+ fi
+
+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
+
+
- if test -n "$ac_tool_prefix"; then
- for ac_prog in fastjar jar
- do
-@@ -12958,6 +12963,7 @@
- UNZIP!$UNZIP$ac_delim
- CPIO!$CPIO$ac_delim
+ if test "x$FASTJAR" = x; then
+ { { echo "$as_me:$LINENO: error: Can't find fastjar or jar" >&5
+ echo "$as_me: error: Can't find fastjar or jar" >&2;}
+@@ -12960,6 +12965,7 @@
FILE!$FILE$ac_delim
-+ALT_OPT_CFLAGS!$ALT_OPT_CFLAGS$ac_delim
FASTJAR!$FASTJAR$ac_delim
ac_ct_FASTJAR!$ac_ct_FASTJAR$ac_delim
++ALT_OPT_CFLAGS!$ALT_OPT_CFLAGS$ac_delim
GAWK!$GAWK$ac_delim
+ SYSTEM_GCJ_DIR!$SYSTEM_GCJ_DIR$ac_delim
+ SYSTEM_OPENJDK_DIR!$SYSTEM_OPENJDK_DIR$ac_delim
@@ -13044,7 +13050,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
More information about the fedora-extras-commits
mailing list