[java-1.8.0-openjdk] Update to b87
Omair Majid
omajid at fedoraproject.org
Tue Apr 30 05:46:09 UTC 2013
commit 481efdfc71d6882ada29ce54720afd8a063d2053
Author: Omair Majid <omajid at redhat.com>
Date: Tue Apr 30 01:45:49 2013 -0400
Update to b87
.gitignore | 1 +
fix-zero-build-on-arm.patch | 113 ++++++++++++++++++++++++++++++
fix-zero-build.patch | 158 -------------------------------------------
generate_source_tarball.sh | 2 +-
java-1.8.0-openjdk.spec | 68 ++++---------------
rhino.patch | 157 ------------------------------------------
sources | 3 +-
system-giflib.patch | 104 ----------------------------
system-lcms.patch | 32 +++++-----
system-libjpeg.patch | 4 +-
system-libpng.patch | 4 +-
11 files changed, 149 insertions(+), 497 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d942194..bf58a30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/desktop-files.tar.gz
/jdk8-b79.tar.gz
/systemtap-tapset.tar.gz
+/jdk8-b87.tar.gz
diff --git a/fix-zero-build-on-arm.patch b/fix-zero-build-on-arm.patch
new file mode 100644
index 0000000..fbdd47d
--- /dev/null
+++ b/fix-zero-build-on-arm.patch
@@ -0,0 +1,113 @@
+# HG changeset patch
+# User omajid
+# Date 1367253270 14400
+# Node ID 1dfcc874461e8348a1066c360d1c33db72cebf55
+# Parent b9415faa7066a4d3b16d466556d5428446918d95
+8013480: fix zero build on arm
+Reviewed-by: erikj
+
+--- jdk8/common/autoconf/platform.m4 Tue Apr 23 09:26:43 2013 -0700
++++ jdk8/common/autoconf/platform.m4 Mon Apr 29 12:34:30 2013 -0400
+@@ -342,6 +342,7 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS],
+ *)
+ ZERO_ARCHFLAG="-m${OPENJDK_TARGET_CPU_BITS}"
+ esac
++ PLATFORM_COMPILER_CHECK_ARGUMENTS([$ZERO_ARCHFLAG], [], [ZERO_ARCHFLAG=""])
+ AC_SUBST(ZERO_ARCHFLAG)
+
+ # ZERO_ARCHDEF is used to enable architecture-specific code
+@@ -417,6 +418,51 @@ AC_SUBST(OS_VERSION_MICRO)
+ AC_SUBST(OS_VERSION_MICRO)
+ ])
+
++# PLATFORM_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
++# [RUN-IF-FALSE])
++# ------------------------------------------------------------
++# Check that the c and c++ compilers support an argument
++AC_DEFUN([PLATFORM_COMPILER_CHECK_ARGUMENTS],
++[
++ AC_MSG_CHECKING([if compiler supports "$1"])
++ supports=yes
++
++ saved_cflags="$CFLAGS"
++ CFLAGS="$CFLAGS $1"
++ AC_LANG_PUSH([C])
++ AC_COMPILE_IFELSE([
++ AC_LANG_SOURCE([[int i;]])
++ ], [], [supports=no])
++ AC_LANG_POP([C])
++ CFLAGS="$saved_cflags"
++
++ saved_cxxflags="$CXXFLAGS"
++ CXXFLAGS="$CXXFLAG $1"
++ AC_LANG_PUSH([C++])
++ AC_COMPILE_IFELSE([
++ AC_LANG_SOURCE([[int i;]])
++ ], [], [supports=no])
++ AC_LANG_POP([C++])
++ CXXFLAGS="$saved_cxxflags"
++
++ AC_MSG_RESULT([$supports])
++ if test "x$supports" = "xyes" ; then
++ m4_ifval([$2], [$2], [:])
++ else
++ m4_ifval([$3], [$3], [:])
++ fi
++])
++
++# Check that the compiler supports -mX flags
++# Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does
++AC_DEFUN([PLATFORM_CHECK_COMPILER_TARGET_BITS_FLAGS],
++[
++ PLATFORM_COMPILER_CHECK_ARGUMENTS([-m${OPENJDK_TARGET_CPU_BITS}],
++ [COMPILER_SUPPORTS_TARGET_BITS_FLAG=true],
++ [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false])
++ AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
++])
++
+ # Support macro for PLATFORM_SETUP_OPENJDK_TARGET_BITS.
+ # Add -mX to various FLAGS variables.
+ AC_DEFUN([PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS],
+@@ -444,6 +490,9 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TA
+ # (The JVM can use 32 or 64 bit Java pointers but that decision
+ # is made at runtime.)
+ #
++
++PLATFORM_CHECK_COMPILER_TARGET_BITS_FLAGS
++
+ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+ # Always specify -m flags on Solaris
+ PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS
+--- jdk8/common/autoconf/spec.gmk.in Tue Apr 23 09:26:43 2013 -0700
++++ jdk8/common/autoconf/spec.gmk.in Mon Apr 29 12:34:30 2013 -0400
+@@ -300,6 +300,8 @@ MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
+ # CC is gcc and others behaving reasonably similar.
+ # CL is cl.exe only.
+ COMPILER_TYPE:=@COMPILER_TYPE@
++
++COMPILER_SUPPORTS_TARGET_BITS_FLAG=@COMPILER_SUPPORTS_TARGET_BITS_FLAG@
+
+ CC_OUT_OPTION:=@CC_OUT_OPTION@
+ EXE_OUT_OPTION:=@EXE_OUT_OPTION@
+
+
+--- jdk8/jdk/makefiles/GensrcX11Wrappers.gmk Tue Apr 23 18:25:52 2013 -0700
++++ jdk8/jdk/makefiles/GensrcX11Wrappers.gmk Mon Apr 29 12:34:53 2013 -0400
+@@ -86,10 +86,15 @@ ifneq ($(COMPILE_TYPE),cross)
+ $(MKDIR) -p $(@D)
+ $(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $*
+
++ # use -m32/-m64 only if the compiler supports it
++ ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG),true)
++ MEMORY_MODEL_FLAG="-m$*"
++ endif
++
+ # Compile the C code into an executable.
+ $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
+ $(MKDIR) -p $(@D)
+- (cd $(@D) && $(CC) -m$* -o $@ $< \
++ (cd $(@D) && $(CC) $(MEMORY_MODEL_FLAG) -o $@ $< \
+ $(X_CFLAGS) \
+ $(X_LIBS) \
+ -I$(JDK_OUTPUTDIR)/include \
+
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 1463e97..7e0509f 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -16,7 +16,7 @@ mv jdk8-${VERSION} jdk8
rm -f jdk8/.hg*
pushd jdk8
-for repos in corba jaxp jaxws langtools hotspot jdk
+for repos in corba jaxp jaxws langtools hotspot jdk nashorn
do
wget -O $repos.tar.gz ${JDK8_URL}/${repos}/archive/${VERSION}.tar.gz
tar xzf $repos.tar.gz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 5e96a95..8058d13 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -1,7 +1,7 @@
# If debug is 1, OpenJDK is built with all debug info present.
%global debug 0
-%global jdk8_version b79
+%global jdk8_version b87
%global hg_tag jdk8-%{jdk8_version}
%global multilib_arches %{power64} sparc64 x86_64
@@ -136,7 +136,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 0.4.%{jdk8_version}%{?dist}
+Release: 0.5.%{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
@@ -164,8 +164,6 @@ Source2: README.src
# Use 'generate_tarballs.sh' to generate the following tarballs
# They are based on code contained in the IcedTea7 project.
-# Class rewrite to rewrite rhino hierarchy
-Source7: class-rewriter.tar.gz
# Systemtap tapsets. Zipped up to keep it small.
Source8: systemtap-tapset.tar.gz
# .desktop files. Zipped up to keep it small.
@@ -183,15 +181,12 @@ Source13: TestCryptoLevel.java
# RPM/distribution specific patches
# Ignore AWTError when assistive technologies are loaded
-Patch4: %{name}-accessible-toolkit.patch
+Patch1: %{name}-accessible-toolkit.patch
#
# OpenJDK specific patches
#
-# Add rhino support
-Patch100: rhino.patch
-
# Type fixing for s390
Patch101: %{name}-bitmap.patch
Patch102: %{name}-size_t.patch
@@ -199,11 +194,12 @@ Patch102: %{name}-size_t.patch
# Patch for PPC/PPC64
Patch103: %{name}-ppc-zero-hotspot.patch
-Patch200: system-giflib.patch
+# Patch for arm
+Patch104: fix-zero-build-on-arm.patch
+
Patch201: system-libjpeg.patch
Patch202: system-libpng.patch
Patch203: system-lcms.patch
-Patch204: fix-zero-build.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -226,7 +222,6 @@ BuildRequires: libXtst-devel
BuildRequires: pkgconfig
BuildRequires: wget
BuildRequires: xorg-x11-proto-devel
-BuildRequires: rhino
#BuildRequires: redhat-lsb
BuildRequires: zip
# OpenJDK X officially requires OpenJDK (X-1) to build
@@ -248,7 +243,6 @@ BuildRequires: prelink
BuildRequires: systemtap-sdt-devel
%endif
-Requires: rhino
# Require /etc/pki/java/cacerts.
Requires: ca-certificates
# Require jpackage-utils for ownership of /usr/lib/jvm/
@@ -351,20 +345,15 @@ cp %{SOURCE2} .
# OpenJDK patches
-# Rhino patch
-%patch100
-
# Remove libraries that are linked
# disabled until 8 has all system library fixes upstream
sh %{SOURCE12}
-%patch200
%patch201
%patch202
%patch203
-%patch204
-%patch4
+%patch1
# Type fixes for s390
%ifarch s390 s390x
@@ -377,12 +366,7 @@ sh %{SOURCE12}
%patch103
%endif
-
-# Copy jaxp, jaf and jaxws drops
-mkdir drops/
-
-# Extract the rewriter (to rewrite rhino classes)
-tar xzf %{SOURCE7}
+%patch104
# Extract systemtap tapsets
%if %{with_systemtap}
@@ -416,37 +400,6 @@ export ARCH_DATA_MODEL=64
%ifarch alpha
export CFLAGS="$CFLAGS -mieee"
%endif
-# Build the re-written rhino jar
-mkdir -p rhino/{old,new}
-
-# Compile the rewriter
-(cd rewriter
- javac com/redhat/rewriter/ClassRewriter.java
-)
-
-# Extract rhino.jar contents and rewrite
-(cd rhino/old
- jar xf /usr/share/java/rhino.jar
-)
-
-java -cp rewriter com.redhat.rewriter.ClassRewriter \
- $PWD/rhino/old \
- $PWD/rhino/new \
- org.mozilla \
- sun.org.mozilla
-
-(cd rhino/old
- for file in `find -type f -not -name '*.class'` ; do
- new_file=../new/`echo $file | sed -e 's#org#sun/org#'`
- mkdir -pv `dirname $new_file`
- cp -v $file $new_file
- sed -ie 's#org\.mozilla#sun.org.mozilla#g' $new_file
- done
-)
-
-(cd rhino/new
- jar cfm ../rhino.jar META-INF/MANIFEST.MF sun
-)
(cd jdk8/common/autoconf
bash ./autogen.sh
@@ -944,6 +897,11 @@ exit 0
%doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
%changelog
+* Tue Apr 30 2013 Omair Majid <omajid at redhat.com> 1:1.8.0.0-0.5.b87
+- Update to b87
+- Remove all rhino support; use nashorn instead
+- Remove upstreamed/unapplied patches
+
* Tue Apr 23 2013 Karsten Hopp <karsten at redhat.com> 1:1.8.0.0-0.4.b79
- update java-1.8.0-openjdk-ppc-zero-hotspot patch
- use power64 macro
diff --git a/sources b/sources
index be5fdce..0fe71d5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-53f5d8cfe1c1aa478cb0fb64ba149967 class-rewriter.tar.gz
e1d19c1a7e103b9b3c35a94628ded3b5 desktop-files.tar.gz
-71577c85c00f488465e0732cdfee73a7 jdk8-b79.tar.gz
+dec2a6b00beb0c6565d5d93e55316093 jdk8-b87.tar.gz
94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz
diff --git a/system-lcms.patch b/system-lcms.patch
index ea8e94b..59ee908 100644
--- a/system-lcms.patch
+++ b/system-lcms.patch
@@ -48,12 +48,12 @@ diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
# Check for the zlib library
#
-diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibraries.gmk
+diff --git jdk8/jdk/makefiles/CompileNativeLibraries.gmk jdk8/jdk/makefiles/CompileNativeLibraries.gmk
--- jdk8/jdk/makefiles/CompileNativeLibraries.gmk
+++ jdk8/jdk/makefiles/CompileNativeLibraries.gmk
-@@ -1213,8 +1213,8 @@
+@@ -1214,8 +1214,8 @@
+ ##########################################################################################
- ifdef OPENJDK
# TODO: Update awt lib path when awt is converted
- $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS,\
- LIBRARY:=lcms,\
@@ -62,7 +62,7 @@ diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibra
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
SRC:=$(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms,\
LANG:=C,\
-@@ -1232,18 +1232,18 @@
+@@ -1233,18 +1233,18 @@
LDFLAGS_windows:=$(WIN_AWT_LIB) $(WIN_JAVA_LIB),\
LDFLAGS_SUFFIX_solaris:=-lawt -ljava -ljvm -lc,\
LDFLAGS_SUFFIX_macosx:=$(LIBM) -lawt -ljava -ljvm,\
@@ -73,7 +73,7 @@ diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibra
- -D "JDK_FNAME=lcms.dll" \
- -D "JDK_INTERNAL_NAME=lcms" \
+ -D "JDK_FNAME=javalcms.dll" \
-+ -D "JDK_INTERNAL_NAME=javalcms" \
++ -D "JDK_INTERNAL_NAME=libjavalcms" \
-D "JDK_FTYPE=0x2L",\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms,\
DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
@@ -84,18 +84,18 @@ diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibra
+ BUILD_LIBRARIES += $(BUILD_LIBJAVALCMS)
+
+ $(BUILD_LIBJAVALCMS) : $(BUILD_LIBAWT)
- endif
##########################################################################################
-diff --git a/src/share/classes/sun/java2d/cmm/lcms/LCMS.java b/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
+
+diff --git jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
--- jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
+++ jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
-@@ -95,7 +95,7 @@
- * disposer frameworks
- */
- System.loadLibrary("awt");
-- System.loadLibrary("lcms");
-+ System.loadLibrary("javalcms");
- return null;
- }
- }
+@@ -164,7 +164,7 @@
+ * disposer frameworks
+ */
+ System.loadLibrary("awt");
+- System.loadLibrary("lcms");
++ System.loadLibrary("javalcms");
+ return null;
+ }
+ });
diff --git a/system-libjpeg.patch b/system-libjpeg.patch
index fba0a3a..d1c5989 100644
--- a/system-libjpeg.patch
+++ b/system-libjpeg.patch
@@ -139,8 +139,8 @@ diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibra
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\
-- LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(LIBGIF),\
-+ LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(LIBGIF) -ljpeg,\
+- LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS),\
++ LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS) -ljpeg,\
LDFLAGS_SUFFIX_solaris:=-lc,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
diff --git a/system-libpng.patch b/system-libpng.patch
index 2a2fc62..0fceb6b 100644
--- a/system-libpng.patch
+++ b/system-libpng.patch
@@ -64,8 +64,8 @@ diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibra
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\
-- LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(LIBGIF) -ljpeg,\
-+ LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(LIBGIF) -ljpeg -lpng,\
+- LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS) -ljpeg,\
++ LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS) -ljpeg -lpng,\
LDFLAGS_SUFFIX_solaris:=-lc,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
More information about the scm-commits
mailing list