From 0bc19c90ca1ac61c52a519cad60b39dc3f1d0c8c Mon Sep 17 00:00:00 2001 From: Omair Majid Date: May 13 2013 17:11:48 +0000 Subject: Update to b89 --- diff --git a/.gitignore b/.gitignore index bf58a30..f3870b6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /jdk8-b79.tar.gz /systemtap-tapset.tar.gz /jdk8-b87.tar.gz +/jdk8-b89.tar.gz diff --git a/fix-zero-build-on-arm.patch b/fix-zero-build-on-arm.patch deleted file mode 100644 index fbdd47d..0000000 --- a/fix-zero-build-on-arm.patch +++ /dev/null @@ -1,113 +0,0 @@ -# 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/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 8e0469a..e42a7ba 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 b87 +%global jdk8_version b89 %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.5.%{jdk8_version}%{?dist} +Release: 0.6.%{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 @@ -196,9 +196,6 @@ Patch102: %{name}-size_t.patch # Patch for PPC/PPC64 Patch103: %{name}-ppc-zero-hotspot.patch -# Patch for arm -Patch104: fix-zero-build-on-arm.patch - Patch201: system-libjpeg.patch Patch202: system-libpng.patch Patch203: system-lcms.patch @@ -369,8 +366,6 @@ sh %{SOURCE12} %patch103 %endif -%patch104 - # Extract systemtap tapsets %if %{with_systemtap} diff --git a/sources b/sources index 0fe71d5..8b31db4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ e1d19c1a7e103b9b3c35a94628ded3b5 desktop-files.tar.gz -dec2a6b00beb0c6565d5d93e55316093 jdk8-b87.tar.gz 94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz +37ab913f14f25f0e8c5e07adeaeb2f34 jdk8-b89.tar.gz diff --git a/system-lcms.patch b/system-lcms.patch index 59ee908..3509903 100644 --- a/system-lcms.patch +++ b/system-lcms.patch @@ -76,7 +76,7 @@ diff --git jdk8/jdk/makefiles/CompileNativeLibraries.gmk jdk8/jdk/makefiles/Comp + -D "JDK_INTERNAL_NAME=libjavalcms" \ -D "JDK_FTYPE=0x2L",\ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms,\ - DEBUG_SYMBOLS:=$(WINDOWS_ONLY))) + DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) - BUILD_LIBRARIES += $(BUILD_LIBLCMS) - diff --git a/system-libjpeg.patch b/system-libjpeg.patch index d1c5989..f44d891 100644 --- a/system-libjpeg.patch +++ b/system-libjpeg.patch @@ -115,7 +115,7 @@ diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibra - OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjpeg,\ + REORDER:=$(BUILD_LIBJAVAJPEG_REORDER),\ + OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjavajpeg,\ - DEBUG_SYMBOLS:=$(WINDOWS_ONLY))) + DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) -$(BUILD_LIBJPEG) : $(BUILD_LIBJAVA) -