[java-1.8.0-openjdk] Updated aarch64 to latest head Dropped upstreamed patches Updated generate_source_tarball.sh to use
Deepak Bhole
dbhole at fedoraproject.org
Tue Aug 13 19:26:34 UTC 2013
commit c92f8ee4542cab7b3011a9306f9705fd9fecb3fe
Author: Deepak Bhole <dbhole at redhat.com>
Date: Tue Aug 13 15:25:49 2013 -0400
Updated aarch64 to latest head
Dropped upstreamed patches
Updated generate_source_tarball.sh to use tagged aarch64 code
.gitignore | 1 +
generate_source_tarball.sh | 4 +-
java-1.8.0-openjdk-arm64-missing-includes.patch | 31 ----
java-1.8.0-openjdk.spec | 55 ++-----
removeMswitchesFromx11.patch | 12 --
sources | 2 +-
system-lcmsAARCH64.patch | 19 +-
system-libjpegAARCH64.patch | 207 -----------------------
8 files changed, 27 insertions(+), 304 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bb7eb40..679746e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/aarch64-port-b89.tar.xz
/aarch64-port-b89x.tar.xz
/jdk8-b89x.tar.xz
+/aarch64-port-aarch64-20130813.tar.xz
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index a9c70bd..38bb86b 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -21,7 +21,7 @@ do
if [[ "$REPO_NAME" == "aarch64-port" ]] ; then
# aarch64-port does not tag trees
# FIXME make this clone reproducible
- hg clone ${REPO_ROOT}
+ hg clone ${REPO_ROOT} -r ${VERSION}
else
hg clone ${REPO_ROOT} -r ${VERSION}
fi
@@ -45,7 +45,7 @@ do
popd
find jdk8 -type d -name ".hg" -exec rm -rf '{}' \; || echo ok
- tar cJf ${REPO_NAME}-b${VERSION}.tar.xz jdk8
+ tar cJf ${REPO_NAME}-${VERSION}.tar.xz jdk8
popd
done
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index f979e1f..112c495 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -3,6 +3,7 @@
%global jdk8_version b89x
%global hg_tag jdk8-%{jdk8_version}
+%global aarch64_hg_tag aarch64-20130813
%global aarch64 aarch64 arm64 armv8
%global multilib_arches %{power64} sparc64 x86_64 %{aarch64}
@@ -142,7 +143,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 0.16.%{jdk8_version}%{?dist}
+Release: 0.17.%{jdk8_version}%{?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
@@ -159,11 +160,12 @@ Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and LGPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C
URL: http://openjdk.java.net/
-# Source from upstrem OpenJDK8 project. Use
-# './generate_source_tarball.sh %{hg_tag}' to generate. The script clones
-# repositories of jdk8 and aarch64-port and removes code not allowed in Fedora.
+# Source from upstrem OpenJDK8 project. Use
+# './generate_source_tarball.sh %{hg_tag|aarch64_hg_tag}' to generate.
+# The script clones repositories of jdk8 and aarch64-port and removes
+# code not allowed in Fedora.
Source0: jdk8-%{jdk8_version}.tar.xz
-Source1: aarch64-port-%{jdk8_version}.tar.xz
+Source1: aarch64-port-%{aarch64_hg_tag}.tar.xz
# Custom README for -src subpackage
Source2: README.src
@@ -207,25 +209,11 @@ Patch102: %{name}-size_t.patch
Patch103: %{name}-ppc-zero-hotspot.patch
Patch201: system-libjpeg.patch
-Patch2011: system-libjpegAARCH64.patch
Patch202: system-libpng.patch
Patch203: system-lcms.patch
Patch2031: system-lcmsAARCH64.patch
-Patch301: removeMswitchesFromx11.patch
-Patch302: %{name}-arm64-missing-includes.patch
-Patch310: fix-jvm-cfg.patch
-
-# To apply 8011366-jdk.patch below, aarch64-port-custom changes need to be rolled back
-Patch303: 73799ba02d7f.patch
-# These patches are already upstream but not included in the port yet
-# http://hg.openjdk.java.net/jdk8/build/jdk/rev/f559fadbf491
-Patch304: 8015087-jdk.patch
-# http://hg.openjdk.java.net/jdk8/build/rev/cb51fb4789ac
-Patch305: 8015087-root.patch
-# http://hg.openjdk.java.net/jdk8/build/jdk/rev/88125d32eb06
-Patch306: 8011366-jdk.patch
-
+Patch301: fix-jvm-cfg.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -386,12 +374,7 @@ cp %{SOURCE101} jdk8/common/autoconf/build-aux/
sh %{SOURCE12}
-%ifarch %{aarch64}
-%patch2011
-%else
%patch201
-%endif
-
%patch202
%ifarch %{aarch64}
@@ -415,24 +398,10 @@ sh %{SOURCE12}
%patch103
%endif
-%ifarch %{aarch64}
-%patch301
-
-pushd jdk8/hotspot >& /dev/null
-%patch302 -p1
-popd >& /dev/null
+%ifnarch %{aarch64}
pushd jdk8
-%patch303 -p1
-%patch304 -p1
-%patch305 -p1
-%patch306 -p1
-popd
-
-%else
-
-pushd jdk8
-%patch310 -p1
+%patch301 -p1
popd
%endif
@@ -977,6 +946,10 @@ exit 0
%doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
%changelog
+* Tue Aug 13 2013 Deepak Bhole <dbhole at redhat.com> - 1:1.8.0.0-0.17.b89x
+- Updated aarch64 to latest head
+- Dropped upstreamed patches
+
* Wed Aug 07 2013 Omair Majid <omajid at redhat.com> - 1:1.8.0.0-0.16.b89x
- The zero fix only applies on b89 tarball
diff --git a/sources b/sources
index 2d439d4..02bcff5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz
e1d19c1a7e103b9b3c35a94628ded3b5 desktop-files.tar.gz
ba47bbce1edaf42bda8dc4557962babc jdk8-b89x.tar.xz
-475e23a72041086c23b541d5563e28fe aarch64-port-b89x.tar.xz
+100508e1b8fa8653525e0454f29a9fd8 aarch64-port-aarch64-20130813.tar.xz
diff --git a/system-lcmsAARCH64.patch b/system-lcmsAARCH64.patch
index f0b6057..17c2c28 100644
--- a/system-lcmsAARCH64.patch
+++ b/system-lcmsAARCH64.patch
@@ -48,10 +48,10 @@ diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
# Check for the zlib library
#
-diff --git jdk8/jdk/makefiles/CompileNativeLibraries.gmk jdk8/jdk/makefiles/CompileNativeLibraries.gmk
---- jdk8/jdk/makefiles/CompileNativeLibraries.gmk
-+++ jdk8/jdk/makefiles/CompileNativeLibraries.gmk
-@@ -1215,8 +1215,8 @@
+diff -up ./jdk8/jdk/makefiles/CompileNativeLibraries.gmk.sav ./jdk8/jdk/makefiles/CompileNativeLibraries.gmk
+--- ./jdk8/jdk/makefiles/CompileNativeLibraries.gmk.sav 2013-08-13 12:37:05.000000000 -0400
++++ ./jdk8/jdk/makefiles/CompileNativeLibraries.gmk 2013-08-13 14:31:24.000000000 -0400
+@@ -1224,8 +1224,8 @@ BUILD_LIBRARIES += $(BUILD_LIBJSDT)
ifdef OPENJDK
# TODO: Update awt lib path when awt is converted
@@ -62,7 +62,7 @@ diff --git jdk8/jdk/makefiles/CompileNativeLibraries.gmk jdk8/jdk/makefiles/Comp
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
SRC:=$(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms,\
LANG:=C,\
-@@ -1234,18 +1234,18 @@
+@@ -1243,18 +1243,18 @@ ifdef OPENJDK
LDFLAGS_windows:=$(WIN_AWT_LIB) $(WIN_JAVA_LIB),\
LDFLAGS_SUFFIX_solaris:=-lawt -ljava -ljvm -lc,\
LDFLAGS_SUFFIX_macosx:=$(LIBM) -lawt -ljava -ljvm,\
@@ -73,16 +73,15 @@ diff --git jdk8/jdk/makefiles/CompileNativeLibraries.gmk jdk8/jdk/makefiles/Comp
- -D "JDK_FNAME=lcms.dll" \
- -D "JDK_INTERNAL_NAME=lcms" \
+ -D "JDK_FNAME=javalcms.dll" \
-+ -D "JDK_INTERNAL_NAME=libjavalcms" \
++ -D "JDK_INTERNAL_NAME=javalcms" \
-D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms,\
- DEBUG_SYMBOLS:=true))
+ DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
- BUILD_LIBRARIES += $(BUILD_LIBLCMS)
--
-- $(BUILD_LIBLCMS) : $(BUILD_LIBAWT)
+ BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS)
-+
+
+- $(BUILD_LIBLCMS) : $(BUILD_LIBAWT)
+ $(BUILD_LIBJAVALCMS) : $(BUILD_LIBAWT)
endif
More information about the scm-commits
mailing list