rpms/java-1.8.0-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to b87

Browse Source
This commit is contained in:
Omair Majid 2013-04-30 01:45:49 -04:00
parent 68a71d9792
commit 481efdfc71
11 changed files with 149 additions and 497 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/desktop-files.tar.gz
/jdk8-b79.tar.gz
/systemtap-tapset.tar.gz
/jdk8-b87.tar.gz

113
fix-zero-build-on-arm.patch Normal file
View File

@ -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 \

158
fix-zero-build.patch
View File

@ -1,158 +0,0 @@
--- jdk8/jdk/makefiles/Profiles.gmk 2013-03-28 16:57:56.137703554 -0400
+++ jdk8/jdk/makefiles/Profiles.gmk 2013-03-28 16:57:55.674699054 -0400
@@ -94,8 +94,11 @@
$(IMAGES_OUTPUTDIR)/lib/tools.jar \
$(IMAGES_OUTPUTDIR)/lib/ct.sym \
$(IMAGES_OUTPUTDIR)/src.zip \
- $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar \
- $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar
+ $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar
+
+ifeq ($(INCLUDE_SA),true)
+ ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar
+endif
ifeq ($(OPENJDK_TARGET_OS),solaris)
ifndef OPENJDK
--- jdk8/common/autoconf/hotspot-spec.gmk.in 2013-03-28 17:00:44.110332528 -0400
+++ jdk8/common/autoconf/hotspot-spec.gmk.in 2013-03-28 17:00:43.915330640 -0400
@@ -75,6 +75,19 @@
# If yes then this expands to _LP64:=1
@LP64@
+# Legacy settings for zero
+ZERO_ENDIANNESS=$(OPENJDK_TARGET_CPU_ENDIAN)
+ZERO_LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB)
+ZERO_ARCHDEF=@ZERO_ARCHDEF@
+ZERO_ARCHFLAG=@ZERO_ARCHFLAG@
+LIBFFI_CFLAGS=@LIBFFI_CFLAGS@
+LIBFFI_LIBS=@LIBFFI_LIBS@
+
+# Legacy settings for zeroshark
+LLVM_CFLAGS=@LLVM_CFLAGS@
+LLVM_LIBS=@LLVM_LIBS@
+LLVM_LDFLAGS=@LLVM_LDFLAGS@
+
ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
ALT_EXPORT_PATH=$(HOTSPOT_DIST)
--- jdk8/common/autoconf/libraries.m4 2013-03-28 17:00:45.905349901 -0400
+++ jdk8/common/autoconf/libraries.m4 2013-03-28 17:00:45.632347258 -0400
@@ -662,7 +662,7 @@
AC_MSG_CHECKING([how to link with libstdc++])
# If dynamic was requested, it's available since it would fail above otherwise.
# If dynamic wasn't requested, go with static unless it isn't available.
- if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno; then
+ if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
LIBCXX="$LIBCXX -lstdc++"
LDCXX="$CXX"
STATIC_CXX_SETTING="STATIC_CXX=false"
@@ -676,6 +676,59 @@
fi
AC_SUBST(STATIC_CXX_SETTING)
+if test "x$JVM_VARIANT_ZERO" = xtrue || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
+ # Figure out LIBFFI_CFLAGS and LIBFFI_LIBS
+ PKG_CHECK_MODULES([LIBFFI], [libffi])
+
+fi
+
+if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
+ AC_CHECK_PROG([LLVM_CONFIG], [llvm-config], [llvm-config])
+
+ if test "x$LLVM_CONFIG" != xllvm-config; then
+ AC_MSG_ERROR([llvm-config not found in $PATH.])
+ fi
+
+ llvm_components="jit mcjit engine nativecodegen native"
+ unset LLVM_CFLAGS
+ for flag in $("$LLVM_CONFIG" --cxxflags); do
+ if echo "${flag}" | grep -q '^-@<:@ID@:>@'; then
+ if test "${flag}" != "-D_DEBUG" ; then
+ if test "${LLVM_CFLAGS}" != "" ; then
+ LLVM_CFLAGS="${LLVM_CFLAGS} "
+ fi
+ LLVM_CFLAGS="${LLVM_CFLAGS}${flag}"
+ fi
+ fi
+ done
+ llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//')
+ LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}"
+
+ unset LLVM_LDFLAGS
+ for flag in $("${LLVM_CONFIG}" --ldflags); do
+ if echo "${flag}" | grep -q '^-L'; then
+ if test "${LLVM_LDFLAGS}" != ""; then
+ LLVM_LDFLAGS="${LLVM_LDFLAGS} "
+ fi
+ LLVM_LDFLAGS="${LLVM_LDFLAGS}${flag}"
+ fi
+ done
+
+ unset LLVM_LIBS
+ for flag in $("${LLVM_CONFIG}" --libs ${llvm_components}); do
+ if echo "${flag}" | grep -q '^-l'; then
+ if test "${LLVM_LIBS}" != ""; then
+ LLVM_LIBS="${LLVM_LIBS} "
+ fi
+ LLVM_LIBS="${LLVM_LIBS}${flag}"
+ fi
+ done
+
+ AC_SUBST(LLVM_CFLAGS)
+ AC_SUBST(LLVM_LDFLAGS)
+ AC_SUBST(LLVM_LIBS)
+fi
+
# libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x; then
LIBCXX="/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
--- jdk8/common/autoconf/platform.m4 2013-03-28 17:00:47.585366160 -0400
+++ jdk8/common/autoconf/platform.m4 2013-03-28 17:00:47.389364263 -0400
@@ -332,6 +332,29 @@
DEFINE_CROSS_COMPILE_ARCH=""
fi
AC_SUBST(DEFINE_CROSS_COMPILE_ARCH)
+
+ # Some Zero and Shark settings.
+ # ZERO_ARCHFLAG tells the compiler which mode to build for
+ case "${OPENJDK_TARGET_CPU}" in
+ s390)
+ ZERO_ARCHFLAG="-m31"
+ ;;
+ *)
+ ZERO_ARCHFLAG="-m${OPENJDK_TARGET_CPU_BITS}"
+ esac
+ AC_SUBST(ZERO_ARCHFLAG)
+
+ # ZERO_ARCHDEF is used to enable architecture-specific code
+ case "${OPENJDK_TARGET_CPU}" in
+ ppc*) ZERO_ARCHDEF=PPC ;;
+ s390*) ZERO_ARCHDEF=S390 ;;
+ sparc*) ZERO_ARCHDEF=SPARC ;;
+ x86_64*) ZERO_ARCHDEF=AMD64 ;;
+ x86) ZERO_ARCHDEF=IA32 ;;
+ *) ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
+ esac
+ AC_SUBST(ZERO_ARCHDEF)
+
])
AC_DEFUN([PLATFORM_SET_RELEASE_FILE_OS_VALUES],
--- jdk8/common/autoconf/spec.gmk.in 2013-03-28 17:00:49.065380483 -0400
+++ jdk8/common/autoconf/spec.gmk.in 2013-03-28 17:00:48.870378596 -0400
@@ -634,6 +634,14 @@
# Name of Service Agent library
SALIB_NAME=@SALIB_NAME@
+INCLUDE_SA:=true
+ifeq ($(JVM_VARIANT_ZERO),true)
+ INCLUDE_SA:=false
+endif
+ifeq ($(JVM_VARIANT_ZEROSHARK),true)
+ INCLUDE_SA:=false
+endif
+
OS_VERSION_MAJOR:=@OS_VERSION_MAJOR@
OS_VERSION_MINOR:=@OS_VERSION_MINOR@
OS_VERSION_MICRO:=@OS_VERSION_MICRO@

2
generate_source_tarball.sh
View File

@ -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

68
java-1.8.0-openjdk.spec
View File

@ -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@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@redhat.com> 1:1.8.0.0-0.4.b79
- update java-1.8.0-openjdk-ppc-zero-hotspot patch
- use power64 macro

157
rhino.patch
View File

@ -1,157 +0,0 @@
diff --git a/make/com/sun/Makefile b/make/com/sun/Makefile
--- jdk8/jdk/make/com/sun/Makefile
+++ jdk8/jdk/make/com/sun/Makefile
@@ -31,13 +31,6 @@
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
-ifndef OPENJDK
- ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,)
- ifneq ("$(ORG_EXISTS)", "")
- SCRIPT_SUBDIR = script
- endif
-endif
-
# jarsigner is part of JRE
SUBDIRS = java security net/ssl jarsigner
@@ -45,7 +38,7 @@
SUBDIRS_desktop = image
SUBDIRS_enterprise = crypto/provider jndi \
org rowset net/httpserver
-SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo
+SUBDIRS_misc = script tracing servicetag nio demo
SUBDIRS_tools = tools
diff --git a/make/com/sun/script/Makefile b/make/com/sun/script/Makefile
--- jdk8/jdk/make/com/sun/script/Makefile
+++ jdk8/jdk/make/com/sun/script/Makefile
@@ -31,6 +31,8 @@
AUTO_FILES_JAVA_DIRS = com/sun/script
+OTHER_JAVACFLAGS = -classpath $(RHINO_JAR)
+
#
# Files that need to be copied
#
diff --git a/make/common/Release.gmk b/make/common/Release.gmk
--- jdk8/jdk/make/common/Release.gmk
+++ jdk8/jdk/make/common/Release.gmk
@@ -813,6 +813,7 @@
$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
+ $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
ifneq ($(JFR_JAR),)
$(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
endif
diff --git a/src/share/classes/com/sun/script/javascript/ExternalScriptable.java b/src/share/classes/com/sun/script/javascript/ExternalScriptable.java
--- jdk8/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java
+++ jdk8/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java
@@ -24,7 +24,7 @@
*/
package com.sun.script.javascript;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
import javax.script.*;
import java.util.*;
diff --git a/src/share/classes/com/sun/script/javascript/JSAdapter.java b/src/share/classes/com/sun/script/javascript/JSAdapter.java
--- jdk8/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java
+++ jdk8/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java
@@ -25,7 +25,7 @@
package com.sun.script.javascript;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
import java.util.*;
/**
diff --git a/src/share/classes/com/sun/script/javascript/JavaAdapter.java b/src/share/classes/com/sun/script/javascript/JavaAdapter.java
--- jdk8/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java
+++ jdk8/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
import javax.script.Invocable;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
/**
* This class implements Rhino-like JavaAdapter to help implement a Java
diff --git a/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java b/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java
--- jdk8/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java
+++ jdk8/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
import java.util.*;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
/**
* This class prevents script access to certain sensitive classes.
diff --git a/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java b/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java
--- jdk8/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java
+++ jdk8/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java
@@ -25,7 +25,7 @@
package com.sun.script.javascript;
import javax.script.*;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
/**
* Represents compiled JavaScript code.
diff --git a/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java b/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java
--- jdk8/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java
+++ jdk8/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
import com.sun.script.util.*;
import javax.script.*;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
import java.lang.reflect.Method;
import java.io.*;
import java.util.*;
diff --git a/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java b/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java
--- jdk8/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java
+++ jdk8/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java
@@ -26,7 +26,7 @@
package com.sun.script.javascript;
import javax.script.*;
import java.util.*;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
import com.sun.script.util.*;
/**
diff --git a/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java b/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
--- jdk8/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
+++ jdk8/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
@@ -25,7 +25,7 @@
package com.sun.script.javascript;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
import javax.script.*;
/**
diff --git a/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java b/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java
--- jdk8/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java
+++ jdk8/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java
@@ -27,7 +27,7 @@
import java.lang.reflect.*;
import static sun.security.util.SecurityConstants.*;
-import sun.org.mozilla.javascript.internal.*;
+import sun.org.mozilla.javascript.*;
/**
* This wrap factory is used for security reasons. JSR 223 script

3
sources
View File

@ -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

104
system-giflib.patch
View File

@ -1,104 +0,0 @@
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
--- jdk8/common/autoconf/libraries.m4
+++ jdk8/common/autoconf/libraries.m4
@@ -499,11 +499,40 @@
# Check for the gif library
#
-USE_EXTERNAL_LIBJPEG=true
-AC_CHECK_LIB(gif, main, [],
- [ USE_EXTERNAL_LIBGIF=false
- AC_MSG_NOTICE([Will use gif decoder bundled with the OpenJDK source])
- ])
+AC_ARG_WITH(giflib, [AS_HELP_STRING([--with-giflib],
+ [use giflib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
+
+AC_CHECK_LIB(gif, DGifGetCode,
+ [ GIFLIB_FOUND=yes ],
+ [ GIFLIB_FOUND=no ])
+
+AC_MSG_CHECKING([for which giflib to use])
+
+# default is bundled
+DEFAULT_GIFLIB=bundled
+
+#
+# if user didn't specify, use DEFAULT_GIFLIB
+#
+if test "x${with_giflib}" = "x"; then
+ with_giflib=${DEFAULT_GIFLIB}
+fi
+
+
+if test "x${with_giflib}" = "xbundled"; then
+ USE_EXTERNAL_LIBGIF=false
+ AC_MSG_RESULT([bundled])
+elif test "x${with_giflib}" = "xsystem"; then
+ if test "x${GIFLIB_FOUND}" = "xyes"; then
+ USE_EXTERNAL_LIBGIF=true
+ AC_MSG_RESULT([system])
+ else
+ AC_MSG_RESULT([system not found])
+ AC_MSG_ERROR([--with-giflib=system specified, but no giflib found!])
+ fi
+else
+ AC_MSG_ERROR([Invalid value of --with-giflib: ${with_giflib}, use 'system' or 'bundled'])
+fi
AC_SUBST(USE_EXTERNAL_LIBGIF)
###############################################################################
diff --git a/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibraries.gmk
--- jdk8/jdk/makefiles/CompileNativeLibraries.gmk
+++ jdk8/jdk/makefiles/CompileNativeLibraries.gmk
@@ -2385,18 +2385,23 @@
ifndef BUILD_HEADLESS_ONLY
LIBSPLASHSCREEN_DIRS:=\
- $(JDK_TOPDIR)/src/share/native/sun/awt/giflib \
$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
$(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
$(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
+ifeq ($(USE_EXTERNAL_LIBGIF),true)
+ LIBGIF := -lgif
+else
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib
+ LIBGIF_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
+endif
+
ifneq ($(OPENJDK_TARGET_OS), macosx)
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
else
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
endif
-
LIBSPLASHSCREEN_CFLAGS:=-DSPLASHSCREEN -DPNG_NO_MMX_CODE \
$(foreach dir,$(LIBSPLASHSCREEN_DIRS),-I$(dir))
@@ -2448,11 +2453,11 @@
EXCLUDE_FILES:=imageioJPEG.c jpegdecoder.c pngtest.c,\
LANG:=C,\
OPTIMIZATION:=LOW, \
- CFLAGS:=$(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB),\
+ CFLAGS:=$(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) -I$(LIBGIF_CFLAGS),\
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\
- LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ),\
+ LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(LIBGIF),\
LDFLAGS_SUFFIX_solaris:=-lc,\
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
RC_FLAGS:=$(RC_FLAGS)\
diff --git a/src/share/native/sun/awt/splashscreen/splashscreen_gif.c b/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
@@ -26,7 +26,7 @@
#include "splashscreen_impl.h"
#include "splashscreen_gfx.h"
-#include "../giflib/gif_lib.h"
+#include "gif_lib.h"
#define GIF_TRANSPARENT 0x01
#define GIF_USER_INPUT 0x02

32
system-lcms.patch
View File

@ -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;
}
});

4
system-libjpeg.patch
View File

@ -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)\

4
system-libpng.patch
View File

@ -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)\