[java-1.6.0-openjdk/f15-arm] Updated for ARM build based on fixes by Andrew Haley (aph at redhat dot com)
Deepak Bhole
dbhole at fedoraproject.org
Tue Jan 31 18:57:14 UTC 2012
commit 96e764c481329e180ba532c105b2eda424eb52aa
Author: Deepak Bhole <dbhole at redhat.com>
Date: Tue Jan 31 13:57:03 2012 -0500
Updated for ARM build based on fixes by Andrew Haley (aph at redhat dot com)
java-1.6.0-openjdk-arm-asm-int-fix.patch | 21 ++++++++
java-1.6.0-openjdk-noerror.patch | 22 +++++++++
java-1.6.0-openjdk.spec | 77 +++++++++++++++++++-----------
sources | 6 +-
4 files changed, 95 insertions(+), 31 deletions(-)
---
diff --git a/java-1.6.0-openjdk-arm-asm-int-fix.patch b/java-1.6.0-openjdk-arm-asm-int-fix.patch
new file mode 100644
index 0000000..18a3f86
--- /dev/null
+++ b/java-1.6.0-openjdk-arm-asm-int-fix.patch
@@ -0,0 +1,21 @@
+diff -up ./arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S.sav ./arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+--- ./arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S.sav 2012-01-31 12:49:48.091126039 -0500
++++ ./arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S 2012-01-31 12:50:17.362657755 -0500
+@@ -3576,6 +3576,7 @@ handle_exception_with_bcp:
+ return_check_monitors:
+ stmdb arm_sp!, {r4, lr}
+
++ DECACHE_JPC
+ ldr r2, [istate, #ISTATE_METHOD]
+ ldr r4, [r2, #METHOD_ACCESSFLAGS]
+ tst r4, #1<<5
+diff -U0 ./ChangeLog.sav ./ChangeLog
+--- ./ChangeLog.sav 2012-01-30 22:11:48.011850102 -0500
++++ ./ChangeLog 2012-01-31 12:49:37.226299853 -0500
+@@ -0,0 +1,6 @@
++2012-01-31 Andrew Haley <aph at redhat.com>
++
++ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
++ (return_check_monitors): DECACHE_JPC so that the saved bytecode
++ pointer is correct for the GC.
++
diff --git a/java-1.6.0-openjdk-noerror.patch b/java-1.6.0-openjdk-noerror.patch
new file mode 100644
index 0000000..18af7c9
--- /dev/null
+++ b/java-1.6.0-openjdk-noerror.patch
@@ -0,0 +1,22 @@
+--- openjdk/hotspot/make/linux/makefiles/gcc.make.prev 2011-08-02 11:14:10.000000000 -0400
++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2011-08-02 11:16:39.000000000 -0400
+@@ -123,7 +123,7 @@
+ endif
+
+ # Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++WARNINGS_ARE_ERRORS =
+
+ # Except for a few acceptable ones
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
+--- openjdk-ecj/hotspot/make/linux/makefiles/gcc.make.prev 2011-08-02 11:14:10.000000000 -0400
++++ openjdk-ecj/hotspot/make/linux/makefiles/gcc.make 2011-08-02 11:16:39.000000000 -0400
+@@ -123,7 +123,7 @@
+ endif
+
+ # Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++WARNINGS_ARE_ERRORS =
+
+ # Except for a few acceptable ones
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 4a3cf38..e8b657a 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -138,7 +138,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 65.%{icedteaver}%{?dist}
+Release: 0.arm1.68.%{icedteaver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -163,7 +163,7 @@ Source5: mauve-%{mauvedate}.tar.gz
Source6: mauve_tests
Source7: %{jaxpurl}jaxp144_03.zip
Source8: %{jafurl}jdk6-jaf-b20.zip
-Source9: %{jaxwsurl}jdk6-jaxws2_1_6-2011_06_13.zip
+Source9: %{jaxwsurl}jdk6-jaxws2_1_6-2011_06_13.zip
# FIXME: This patch needs to be fixed. optflags argument
# -mtune=generic is being ignored because it breaks several graphical
# applications.
@@ -172,6 +172,10 @@ Patch1: java-1.6.0-openjdk-java-access-bridge-tck.patch
Patch2: java-1.6.0-openjdk-java-access-bridge-idlj.patch
Patch3: java-1.6.0-openjdk-java-access-bridge-security.patch
Patch4: java-1.6.0-openjdk-accessible-toolkit.patch
+Patch5: java-1.6.0-openjdk-noerror.patch
+
+# Patch1XX - patches already upstream
+Patch100: %{name}-arm-asm-int-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -214,9 +218,13 @@ BuildRequires: gawk
BuildRequires: libbonobo-devel
BuildRequires: pkgconfig >= 0.9.0
BuildRequires: xorg-x11-utils
+
+%ifnarch %{arm}
# PulseAudio build requirements.
BuildRequires: pulseaudio-libs-devel >= 0.9.11
BuildRequires: pulseaudio >= 0.9.11
+%endif
+
# Zero-assembler build requirement.
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
@@ -225,11 +233,16 @@ BuildRequires: libffi-devel
#systemtap build requirement.
BuildRequires: systemtap-sdt-devel
%endif
+
+%ifnarch %{arm}
#fixing 648499
BuildRequires: redhat-lsb
+
#fix for rhbz721033
Requires: xorg-x11-fonts-Type1
+%endif
+
Requires: fontconfig
Requires: rhino
Requires: libjpeg = 6b
@@ -255,25 +268,25 @@ Provides: java-1.7.0-icedtea = 0:1.7.0.0-0.999
Obsoletes: java-1.7.0-icedtea < 0:1.7.0.0-0.999
# Standard JPackage base provides.
-Provides: jre6-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
-Provides: jre6-%{origin} = %{epoch}:%{version}-%{release}
-Provides: jre6-%{javaver} = %{epoch}:%{version}-%{release}
-Provides: java6-%{javaver} = %{epoch}:%{version}-%{release}
-Provides: jre6 = %{javaver}
-Provides: java6-%{origin} = %{epoch}:%{version}-%{release}
-Provides: java6 = %{epoch}:%{javaver}
+Provides: jre-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
+Provides: jre-%{origin} = %{epoch}:%{version}-%{release}
+Provides: jre-%{javaver} = %{epoch}:%{version}-%{release}
+Provides: java-%{javaver} = %{epoch}:%{version}-%{release}
+Provides: jre = %{javaver}
+Provides: java-%{origin} = %{epoch}:%{version}-%{release}
+Provides: java = %{epoch}:%{javaver}
# Standard JPackage extensions provides.
-Provides: jndi6 = %{epoch}:%{version}
-Provides: jndi6-ldap = %{epoch}:%{version}
-Provides: jndi6-cos = %{epoch}:%{version}
-Provides: jndi6-rmi = %{epoch}:%{version}
-Provides: jndi6-dns = %{epoch}:%{version}
-Provides: jaas6 = %{epoch}:%{version}
-Provides: jsse6 = %{epoch}:%{version}
-Provides: jce6 = %{epoch}:%{version}
-Provides: jdbc6-stdext = 3.0
-Provides: java6-sasl = %{epoch}:%{version}
-Provides: java6-fonts = %{epoch}:%{version}
+Provides: jndi = %{epoch}:%{version}
+Provides: jndi-ldap = %{epoch}:%{version}
+Provides: jndi-cos = %{epoch}:%{version}
+Provides: jndi-rmi = %{epoch}:%{version}
+Provides: jndi-dns = %{epoch}:%{version}
+Provides: jaas = %{epoch}:%{version}
+Provides: jsse = %{epoch}:%{version}
+Provides: jce = %{epoch}:%{version}
+Provides: jdbc-stdext = 3.0
+Provides: java-sasl = %{epoch}:%{version}
+Provides: java-fonts = %{epoch}:%{version}
%description
The OpenJDK runtime environment.
@@ -294,13 +307,13 @@ Provides: java-1.7.0-icedtea-devel = 0:1.7.0.0-0.999
Obsoletes: java-1.7.0-icedtea-devel < 0:1.7.0.0-0.999
# Standard JPackage devel provides.
-Provides: java6-sdk-%{javaver}-%{origin} = %{epoch}:%{version}
-Provides: java6-sdk-%{javaver} = %{epoch}:%{version}
-Provides: java6-sdk-%{origin} = %{epoch}:%{version}
-Provides: java6-sdk = %{epoch}:%{javaver}
-Provides: java6-%{javaver}-devel = %{epoch}:%{version}
-Provides: java6-devel-%{origin} = %{epoch}:%{version}
-Provides: java6-devel = %{epoch}:%{javaver}
+Provides: java-sdk-%{javaver}-%{origin} = %{epoch}:%{version}
+Provides: java-sdk-%{javaver} = %{epoch}:%{version}
+Provides: java-sdk-%{origin} = %{epoch}:%{version}
+Provides: java-sdk = %{epoch}:%{javaver}
+Provides: java-%{javaver}-devel = %{epoch}:%{version}
+Provides: java-devel-%{origin} = %{epoch}:%{version}
+Provides: java-devel = %{epoch}:%{javaver}
%description devel
The OpenJDK development tools.
@@ -353,6 +366,7 @@ The OpenJDK API documentation.
%setup -q -n icedtea6-%{icedteaver} -T -D -a 5
%setup -q -n icedtea6-%{icedteaver} -T -D -a 2
#%patch0
+%patch100
cp %{SOURCE4} .
cp %{SOURCE6} .
@@ -367,7 +381,10 @@ export CFLAGS="$CFLAGS -mieee"
./autogen.sh
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
- --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
+%ifnarch %{arm}
+ --enable-pulse-java \
+%endif
+ --with-pkgversion=fedora-%{release}-%{_arch} \
--with-jaf-drop-zip=%{SOURCE8} \
--with-jaxp-drop-zip=%{SOURCE7} --with-jaxws-drop-zip=%{SOURCE9} \
--with-abs-install-dir=%{_jvmdir}/%{sdkdir}
@@ -378,6 +395,7 @@ make stamps/patch-ecj.stamp
make patch
patch -l -p0 < %{PATCH3}
patch -l -p0 < %{PATCH4}
+patch -f -l -p0 < %{PATCH5} || true
make
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -883,6 +901,9 @@ exit 0
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jan 31 2012 Deepak Bhole <dbhole at redhat.com> 1.6.0.0-0.arm1.68.1.11.fc15
+- Updated for ARM build based on fixes by Andrew Haley (aph at redhat dot com)
+
* Tue Jan 31 2012 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-65.1.11
- IcedTea6 bumped to 1.11 release
- Provide a "6" version of items to enforce F-17 policy of Java 7 builds are prior
diff --git a/sources b/sources
index bf5008e..ab33cae 100644
--- a/sources
+++ b/sources
@@ -1,8 +1,8 @@
7a0c160c03012cd40957a7a112e25038 mauve_tests
a9cdc5f050eb6e97c1b15ddd39978710 mauve-2008-10-22.tar.gz
-c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
-10c1cea1d24c064572abfe9687567948 icedtea6-1.11.tar.gz
+7ecb35d87da256e2d4510ce22f56a2bd openjdk-6-src-b24-14_nov_2011-fedora.tar.gz
9eea471ad474040265c688858fcf09aa jaxp144_03.zip
bc95c133620bd68c161cac9891592901 jdk6-jaf-b20.zip
8fd91b09b643a19a912b8a75e7a7a9d5 jdk6-jaxws2_1_6-2011_06_13.zip
-7ecb35d87da256e2d4510ce22f56a2bd openjdk-6-src-b24-14_nov_2011-fedora.tar.gz
+10c1cea1d24c064572abfe9687567948 icedtea6-1.11.tar.gz
+c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
More information about the scm-commits
mailing list