rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-optflags.patch, 1.3, 1.4
Lillian Angel (langel)
fedora-extras-commits at redhat.com
Tue Apr 1 12:49:44 UTC 2008
- Previous message: rpms/PyRTF/devel PyRTF.spec,1.6,1.7
- Next message: rpms/kernel-xen-2.6/devel Makefile, 1.7, 1.8 Makefile.config, 1.7, 1.8 kernel.spec, 1.25, 1.26 linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27822
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- java-1.6.0-openjdk-optflags.patch 27 Mar 2008 17:39:29 -0000 1.3
+++ java-1.6.0-openjdk-optflags.patch 1 Apr 2008 12:49:35 -0000 1.4
@@ -1,68 +1,5 @@
-diff -r 9e9a92bb08c4 patches/icedtea-optflags.patch
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ patches/icedtea-optflags.patch Wed Mar 19 11:52:35 2008 -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%)
---- oldicedtea6/Makefile.am 2008-03-27 10:02:20.000000000 -0400
-+++ Makefile.am 2008-03-27 13:19:02.000000000 -0400
+--- openjdkold/icedtea6/Makefile.am 2008-03-31 13:53:06.000000000 -0400
++++ Makefile.am 2008-04-01 08:43:45.000000000 -0400
@@ -94,6 +94,7 @@
"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
@@ -79,16 +16,28 @@
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
-@@ -277,6 +279,7 @@
- patches/icedtea-lib64.patch \
+@@ -278,6 +280,7 @@
patches/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
+ patches/icedtea-jpegclasses.patch \
+ patches/icedtea-optflags.patch \
$(GCC_PATCH) \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
---- oldicedtea6/Makefile.in 2008-03-27 10:02:25.000000000 -0400
-+++ Makefile.in 2008-03-27 13:19:07.000000000 -0400
+--- openjdkold/icedtea6/configure.ac 2008-03-31 09:47:41.000000000 -0400
++++ configure.ac 2008-04-01 08:41:47.000000000 -0400
+@@ -133,6 +133,9 @@
+ ])
+ AM_CONDITIONAL(WITH_OPENJDK, test "${with_openjdk}" == true)
+
++ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
++AC_SUBST(ALT_OPT_CFLAGS)
++
+ SET_ARCH_DIRS
+ if test "${with_openjdk}" == true
+ then
+--- openjdkold/icedtea6/Makefile.in 2008-03-31 13:53:10.000000000 -0400
++++ Makefile.in 2008-04-01 08:44:03.000000000 -0400
@@ -73,6 +73,7 @@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
@@ -97,7 +46,7 @@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
-@@ -285,6 +285,7 @@
+@@ -287,6 +288,7 @@
"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
@@ -105,7 +54,7 @@
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1)
-@@ -322,6 +323,7 @@
+@@ -324,6 +326,7 @@
"ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
@@ -113,31 +62,19 @@
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_2)
-@@ -381,7 +383,8 @@
- patches/icedtea-timerqueue.patch \
+@@ -384,7 +387,8 @@
patches/icedtea-generated.patch patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
-- patches/icedtea-print-lsb-release.patch $(GCC_PATCH) \
-+ patches/icedtea-print-lsb-release.patch \
+ patches/icedtea-print-lsb-release.patch \
+- patches/icedtea-jpegclasses.patch $(GCC_PATCH) \
++ patches/icedtea-jpegclasses.patch \
+ patches/icedtea-optflags.patch $(GCC_PATCH) \
$(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_3)
# Patch OpenJDK for plug replacements and ecj.
---- oldicedtea6/configure.ac 2008-03-20 10:23:58.000000000 -0400
-+++ configure.ac 2008-03-27 13:19:21.000000000 -0400
-@@ -131,6 +131,9 @@
- ])
- AM_CONDITIONAL(WITH_OPENJDK, test "${with_openjdk}" == true)
-
-+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
-+AC_SUBST(ALT_OPT_CFLAGS)
-+
- SET_ARCH_DIRS
- if test "${with_openjdk}" == true
- then
---- oldicedtea6/configure 2008-03-26 09:54:26.000000000 -0400
-+++ configure 2008-03-27 13:19:24.000000000 -0400
-@@ -724,6 +724,7 @@
+--- openjdkold/icedtea6/configure 2008-03-31 12:15:40.000000000 -0400
++++ configure 2008-04-01 08:44:07.000000000 -0400
+@@ -726,6 +726,7 @@
WITH_ICEDTEA_FALSE
WITH_OPENJDK_TRUE
WITH_OPENJDK_FALSE
@@ -145,7 +82,7 @@
BUILD_ARCH_DIR
INSTALL_ARCH_DIR
JAVA
-@@ -5371,6 +5372,9 @@
+@@ -5591,6 +5592,9 @@
fi
@@ -155,7 +92,7 @@
case "${host}" in
x86_64-*-*)
-@@ -12339,6 +12343,7 @@
+@@ -12561,6 +12565,7 @@
WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$ac_delim
WITH_OPENJDK_TRUE!$WITH_OPENJDK_TRUE$ac_delim
WITH_OPENJDK_FALSE!$WITH_OPENJDK_FALSE$ac_delim
@@ -163,12 +100,74 @@
BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
JAVA!$JAVA$ac_delim
-@@ -12410,7 +12415,7 @@
+@@ -12632,7 +12637,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+--- 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%)
- Previous message: rpms/PyRTF/devel PyRTF.spec,1.6,1.7
- Next message: rpms/kernel-xen-2.6/devel Makefile, 1.7, 1.8 Makefile.config, 1.7, 1.8 kernel.spec, 1.25, 1.26 linux-2.6-xen-0019-xen-x86_64-Initial-x86_64-support-for-Xen-paravirt_.patch, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list