rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-optflags.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 java-1.6.0-openjdk.spec, 1.11, 1.12 sources, 1.8, 1.9

Lillian Angel (langel) fedora-extras-commits at redhat.com
Mon Mar 17 17:42:20 UTC 2008 

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30636

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Added Files:
	java-1.6.0-openjdk-optflags.patch 
Log Message:
* Mon Mar 17 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.5.b06
- Updated icedteasnapshot.
- Updated Release.
- Added new patch: java-1.6.0-openjdk-optflags.patch
- Resolves: rhbz#437331



java-1.6.0-openjdk-optflags.patch:

--- NEW FILE java-1.6.0-openjdk-optflags.patch ---
diff -r d7f8439ac6db Makefile.am
--- a/Makefile.am	Mon Mar 17 08:48:42 2008 -0400
+++ Makefile.am	Mon Mar 17 12:36:28 2008 -0400
@@ -95,6 +95,7 @@ ICEDTEA_ENV = \
 	"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
 	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
 	"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+	"OPT_CFLAGS=$(OPT_CFLAGS)" \
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)"
 
@@ -132,6 +133,7 @@ ICEDTEA_ENV_ECJ = \
 	"LD_LIBRARY_PATH=" \
 	"GENSRCDIR=$(abs_top_srcdir)/generated" \
 	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+	"OPT_CFLAGS=$(OPT_CFLAGS)" \
 	"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
 	"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
 	"ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
@@ -262,6 +264,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-lib64.patch \
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
+	patches/icedtea-optflags.patch \
 	$(GCC_PATCH) \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
diff -r d7f8439ac6db Makefile.in
--- a/Makefile.in	Mon Mar 17 08:48:42 2008 -0400
+++ Makefile.in	Mon Mar 17 12:36:28 2008 -0400
@@ -125,6 +125,7 @@ MOZILLA_LIBS = @MOZILLA_LIBS@
 MOZILLA_LIBS = @MOZILLA_LIBS@
 OBJEXT = @OBJEXT@
 OPENJDK_SRC_DIR = @OPENJDK_SRC_DIR@
+OPT_CFLAGS = @OPT_CFLAGS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -280,6 +281,7 @@ ICEDTEA_ENV = \
 	"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
 	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
 	"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+	"OPT_CFLAGS=$(OPT_CFLAGS)" \
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)"
 
@@ -316,6 +318,7 @@ ICEDTEA_ENV_ECJ = \
 	"LD_LIBRARY_PATH=" \
 	"GENSRCDIR=$(abs_top_srcdir)/generated" \
 	"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+	"OPT_CFLAGS=$(OPT_CFLAGS)" \
 	"ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
 	"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
 	"ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
@@ -396,6 +399,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-lib64.patch \
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
+	patches/icedtea-optflags.patch \
 	$(GCC_PATCH) \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
diff -r d7f8439ac6db configure
--- a/configure	Mon Mar 17 08:48:42 2008 -0400
+++ configure	Mon Mar 17 12:36:28 2008 -0400
@@ -724,6 +724,7 @@ WITH_ICEDTEA_FALSE
 WITH_ICEDTEA_FALSE
 WITH_OPENJDK_TRUE
 WITH_OPENJDK_FALSE
+OPT_CFLAGS
 BUILD_ARCH_DIR
 INSTALL_ARCH_DIR
 JAVA
@@ -5367,6 +5368,9 @@ fi
 fi
 
 
+OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
+
+
 
   case "${host}" in
     x86_64-*-*)
@@ -12284,6 +12288,7 @@ WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$a
 WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$ac_delim
 WITH_OPENJDK_TRUE!$WITH_OPENJDK_TRUE$ac_delim
 WITH_OPENJDK_FALSE!$WITH_OPENJDK_FALSE$ac_delim
+OPT_CFLAGS!$OPT_CFLAGS$ac_delim
 BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
 INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
 JAVA!$JAVA$ac_delim
@@ -12352,7 +12357,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r d7f8439ac6db configure.ac
--- a/configure.ac	Mon Mar 17 08:48:42 2008 -0400
+++ configure.ac	Mon Mar 17 12:36:28 2008 -0400
@@ -130,6 +130,9 @@ AC_ARG_WITH([openjdk],
           with_openjdk=false
         ])
 AM_CONDITIONAL(WITH_OPENJDK, test "${with_openjdk}" == true)
+
+OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
+AC_SUBST(OPT_CFLAGS)
 
 SET_ARCH_DIRS
 if test "${with_openjdk}" == true
diff -r d7f8439ac6db patches/icedtea-optflags.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ patches/icedtea-optflags.patch	Mon Mar 17 12:36:28 2008 -0400
@@ -0,0 +1,13 @@
+--- 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);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Mar 2008 13:53:55 -0000	1.9
+++ .cvsignore	17 Mar 2008 17:41:46 -0000	1.10
@@ -1,5 +1,5 @@
 openjdk-6-src-b06-28_feb_2008-fedora.tar.gz
 mauve_tests
-icedtea6-1.0-20557399a0f6beca21efc8747145b7a9d48ad7f5.tar.gz
 java-access-bridge-1.22.0.tar.gz
 mauve-2008-03-11.tar.gz
+icedtea6-1.0-d7f8439ac6dbb7b038f9af5827e055c9ca8fd2ec.tar.gz


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- java-1.6.0-openjdk.spec	17 Mar 2008 14:46:07 -0000	1.11
+++ java-1.6.0-openjdk.spec	17 Mar 2008 17:41:46 -0000	1.12
@@ -4,7 +4,7 @@
 %define gcjbootstrap 0
 
 %define icedteaver 1.0
-%define icedteasnapshot -20557399a0f6beca21efc8747145b7a9d48ad7f5
+%define icedteasnapshot -d7f8439ac6dbb7b038f9af5827e055c9ca8fd2ec
 %define openjdkver b06
 %define openjdkdate 28_feb_2008
 
@@ -127,10 +127,13 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
-Patch0:   java-1.6.0-openjdk-makefile.patch
+# 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
+Patch1:   java-1.6.0-openjdk-makefile.patch
 # FIXME: The licenses in the jhat sources need to be fixed with proper 
 # GPL Licenses.
-Patch1:   java-1.6.0-openjdk-jhat.patch
+Patch2:   java-1.6.0-openjdk-jhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -318,6 +321,7 @@
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 6
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
+%patch1
 cp %{SOURCE4} .
 cp %{SOURCE5} .
 cp %{SOURCE7} .
@@ -327,11 +331,11 @@
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
 pushd openjdk-ecj
-  patch -l -p1 < %{PATCH1}
+  patch -l -p1 < %{PATCH2}
 popd
 %endif
 make stamps/patch.stamp
-patch -l -p0 < %{PATCH1}
+patch -l -p0 < %{PATCH2}
 make
 pushd java-access-bridge-%{accessver}
   export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image
@@ -786,9 +790,15 @@
 
 %changelog
 * Mon Mar 17 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.5.b06
-- Added version for freetype-devel requirement.
+- Updated icedteasnapshot.
+- Updated Release.
+- Added new patch: java-1.6.0-openjdk-optflags.patch
 - Resolves: rhbz#437331
 
+* Mon Mar 17 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.5.b06
+- Added version for freetype-devel requirement.
+- Resolves: rhbz#437782
+
 * Fri Mar 14 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.4.b06
 - Fixed Provides and Obsoletes for all sub-packages. Should have specified
 java-1.7.0-icedtea < 1.7.0.0-0.999 instead of 1.7.0-0.999.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Mar 2008 13:53:55 -0000	1.8
+++ sources	17 Mar 2008 17:41:46 -0000	1.9
@@ -1,5 +1,5 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 e24e99eeae81f32fa7d958fc75757b83  openjdk-6-src-b06-28_feb_2008-fedora.tar.gz
-bf20d624be29975824331e523484cbeb  icedtea6-1.0-20557399a0f6beca21efc8747145b7a9d48ad7f5.tar.gz
 11d8e6129f27792cc1b0e1a7de2ec127  java-access-bridge-1.22.0.tar.gz
 079e5dc01f2a8720ee3b3dd39119a601  mauve-2008-03-11.tar.gz
+48e0b46998e2f593935ff42be1e7c343  icedtea6-1.0-d7f8439ac6dbb7b038f9af5827e055c9ca8fd2ec.tar.gz

More information about the fedora-extras-commits mailing list