[java-1.6.0-openjdk] added and used patch10 Compiler-gcc.diff to enable shared libraries build under f17 gcc
jiri vanek
jvanek at fedoraproject.org
Mon Jan 30 14:31:13 UTC 2012
commit eb7fc4f4a93ff1bc46693d488081d788e4892983
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date: Mon Jan 30 15:31:06 2012 +0100
added and used patch10 Compiler-gcc.diff to enable shared libraries build under f17 gcc
Compiler-gcc.diff | 16 ++++++++++++++++
java-1.6.0-openjdk.spec | 8 +++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/Compiler-gcc.diff b/Compiler-gcc.diff
new file mode 100644
index 0000000..3a7fb25
--- /dev/null
+++ b/Compiler-gcc.diff
@@ -0,0 +1,16 @@
+--- openjdk/jdk/make/common/shared/Compiler-gcc.gmk-old 2012-01-27 16:37:13.000000000 +0100
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-01-30 15:24:01.496619576 +0100
+@@ -130,11 +130,12 @@
+ # sh4*, sh3*
+ REQUIRED_CC_VER = 4.0
+ REQUIRED_GCC_VER = 4.0.*
+ endif
+ # Option used to create a shared library
+- SHARED_LIBRARY_FLAG = -shared -mimpure-text
++ # SHARED_LIBRARY_FLAG = -shared -mimpure-text
++ SHARED_LIBRARY_FLAG = -shared
+ SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
+
+ endif
+
+ ifeq ($(PLATFORM), solaris)
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 7082851..74ceefb 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -175,8 +175,9 @@ Patch4: java-1.6.0-openjdk-accessible-toolkit.patch
#Patch5: makefile-xalan-deps.patch
#Patch6: glibc-name-clash.patch
#Patch7: icedtea.patch.patch
-#8: Defs-linux.diff
+#Patch8: Defs-linux.diff
Patch9: hotspotGccWerrors.aptch
+Patch10: Compiler-gcc.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -393,6 +394,7 @@ patch -l -p0 < %{PATCH4}
#patch -l -p0 < %{PATCH6}
#patch -l -p0 < %{PATCH8}
patch -l -p0 < %{PATCH9}
+patch -l -p0 < %{PATCH10}
make
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -906,6 +908,10 @@ exit 0
- removed build requires xalan-j2 and xerces-j2
- added build requires libxslt
- removed patch5 - makefile-xalan-deps.patch
+- added bud unused patch7 icedtea.patch.patch and patch8 Defs-linux.diff
+- added and used patch9 hotspotGccWerrors.aptch, to enable hotspot build
+ under f17 gcc
+- added patch10 Compiler-gcc.diff to enable shared libraries build under f17 gcc
* Tue Jan 24 2012 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-63.1.10.5
- updated to icedtea6 1.10.5
More information about the scm-commits
mailing list