pool/java-1_8_0-openjdk
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 253155 from Java:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/253155
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openjdk?expand=0&rev=7
This commit is contained in:
Stephan Kulow 2014-09-30 17:40:39 +00:00 committed by Git OBS Bridge
commit 00fb6ec7b9
27 changed files with 134 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
0032961e1866.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb0e6f9a12e7eab652e71a999206110cc980a3ed8954e2d4010b96e848fcd14f
size 2726883

3
07f0e22b5c23.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5a350e00425b61ef3b3ea7af61d318bfd9e2906fa254ffd4d7762dd70d4e61f4
size 45335499

3
0d09cb188d39.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4598f7c8c4a3d5520dce9fd94f262e153ecd383e6939e70bc2b9b2b30779f25
size 1018064

3
2fa3858a281f.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9dd0d31a78a8921e9f9e63102d567914f03c82073ecf470be0b91f74eb05f35a
size 2360427

3
37bde23c96f6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a11b2244e564cb2032de38c287cabb0465261a650dc932dbf39542764e0d4f16
size 1017673

3
3857b4b27e22.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28273a0bbaaa0632030c01a4d507782e46ed8e52f56e987776274877bbcd55f1
size 2528010

3
5e6d409a7232.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38c5e3a176f58922efa04a24d2d60813eb726875aa00808cbaa43cc2ed4dce00
size 2354048

3
68cf8e406ce5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d405018cdc2d9e5c9d83854e5c9faf4c770bfa5d3e6790f6390ba0776d8284a9
size 7974071

3
7025a2c10ea4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bea93e8d4e7249c34a3fb2de1476235e7ff3886e7c8807851478297f66317171
size 2527645

3
938b9d502c2b.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d283c494ba46b8aa5dcf5232405ed3ddfd294e674e2e0c61ac5323d70957e602
size 2728015

3
a23ac9db4227.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1edf666d95e4889d6317b770612dae9e1f1b3a5c7f5552ac36da09383762e72c
size 2603274

57
aarch64-jni-update.patch
View File

@ -1,57 +0,0 @@
--- jdk8/hotspot/make/linux/makefiles/mapfile-vers-product 2014-06-23 13:56:33.000000000 -0400
+++ jdk8/hotspot/make/linux/makefiles/mapfile-vers-product 2014-07-02 05:11:08.566464756 -0400
@@ -163,6 +163,7 @@
JVM_GetStackTraceElement;
JVM_GetSystemPackage;
JVM_GetSystemPackages;
+ JVM_GetTemporaryDirectory;
JVM_GetThreadStateNames;
JVM_GetThreadStateValues;
JVM_GetVersionInfo;
--- jdk8/hotspot/make/linux/makefiles/mapfile-vers-debug 2014-06-23 13:56:33.000000000 -0400
+++ jdk8/hotspot/make/linux/makefiles/mapfile-vers-debug 2014-07-02 05:10:54.827654319 -0400
@@ -163,6 +163,7 @@
JVM_GetStackTraceElement;
JVM_GetSystemPackage;
JVM_GetSystemPackages;
+ JVM_GetTemporaryDirectory;
JVM_GetThreadStateNames;
JVM_GetThreadStateValues;
JVM_GetVersionInfo;
--- jdk8/hotspot/src/share/vm/prims/jvm.cpp 2014-06-23 13:56:33.000000000 -0400
+++ jdk8/hotspot/src/share/vm/prims/jvm.cpp 2014-07-02 05:09:22.335662279 -0400
@@ -391,6 +391,21 @@
return properties;
JVM_END
+/*
+ * Return the temporary directory that the VM uses for the attach
+ * and perf data files.
+ *
+ * It is important that this directory is well-known and the
+ * same for all VM instances. It cannot be affected by configuration
+ * variables such as java.io.tmpdir.
+ */
+JVM_ENTRY(jstring, JVM_GetTemporaryDirectory(JNIEnv *env))
+ JVMWrapper("JVM_GetTemporaryDirectory");
+ HandleMark hm(THREAD);
+ const char* temp_dir = os::get_temp_directory();
+ Handle h = java_lang_String::create_from_platform_dependent_str(temp_dir, CHECK_NULL);
+ return (jstring) JNIHandles::make_local(env, h());
+JVM_END
// java.lang.Runtime /////////////////////////////////////////////////////////////////////////
--- jdk8/hotspot/src/share/vm/prims/jvm.h 2014-06-23 13:56:33.000000000 -0400
+++ jdk8/hotspot/src/share/vm/prims/jvm.h 2014-07-02 05:07:41.524389758 -0400
@@ -1490,6 +1490,9 @@
JNIEXPORT jobject JNICALL
JVM_InitAgentProperties(JNIEnv *env, jobject agent_props);
+JNIEXPORT jstring JNICALL
+JVM_GetTemporaryDirectory(JNIEnv *env);
+
/* Generics reflection support.
*
* Returns information about the given class's EnclosingMethod

69
aarch64-misc.patch
View File

@ -1,72 +1,3 @@
--- jdk8/common/autoconf/generated-configure.sh 2014-06-18 21:34:07.000000000 +0200
+++ jdk8/common/autoconf/generated-configure.sh 2014-07-09 16:02:13.342878150 +0200
@@ -6818,6 +6818,12 @@
VAR_CPU_BITS=32
VAR_CPU_ENDIAN=little
;;
+ aarch64)
+ VAR_CPU=aarch64
+ VAR_CPU_ARCH=aarch64
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=little
+ ;;
powerpc)
VAR_CPU=ppc
VAR_CPU_ARCH=ppc
@@ -6949,6 +6955,12 @@
VAR_CPU_BITS=32
VAR_CPU_ENDIAN=little
;;
+ aarch64)
+ VAR_CPU=aarch64
+ VAR_CPU_ARCH=aarch64
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=little
+ ;;
powerpc)
VAR_CPU=ppc
VAR_CPU_ARCH=ppc
@@ -7909,11 +7921,6 @@
JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
- if test "x$JVM_VARIANT_CLIENT" = xtrue; then
- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
- as_fn_error $? "You cannot build a client JVM for a 64-bit machine." "$LINENO" 5
- fi
- fi
if test "x$JVM_VARIANT_KERNEL" = xtrue; then
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5
@@ -7953,6 +7960,9 @@
if test "x$VAR_CPU" = xppc64 ; then
INCLUDE_SA=false
fi
+ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
+ INCLUDE_SA=false
+ fi
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
@@ -29712,7 +29722,7 @@
#
case $COMPILER_NAME in
gcc )
- CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
+ CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses \
-pipe \
-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
case $OPENJDK_TARGET_CPU_ARCH in
@@ -29957,6 +29967,9 @@
s390)
ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
;;
+ aarch64)
+ ZERO_ARCHFLAG=""
+ ;;
*)
ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
esac
--- jdk8/common/autoconf/jdk-options.m4 2014-06-18 21:34:07.000000000 +0200
+++ jdk8/common/autoconf/jdk-options.m4 2014-07-09 16:03:01.156813855 +0200
@@ -117,11 +117,6 @@

3
b2210de1587b.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:247062f5bf41bcffbb262d72de08cd0dc38dba25d1f4a2c704590e88d4ee8a24
size 2728846

3
b319f337ea31.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed8a2c755725a7a3843aeba890b9abd9474a73bf7adf8e3560a7a87a4b441334
size 7920315

3
b63d0e8bfc07.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b5125586a22a200676810071196522903378c9a722f420a35130f618274fcd6f
size 7715944

3
cf9afcfcb7a4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb8a48c70c4f66053f20299abd634629092264809e1d94e328989984f3f778c5
size 394835

3
d1a7ea2c3e10.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b3ab64c5e5bf259e4ced4a9d85ff990f54e9fbc19a96b069e758ab0f780c3c66
size 392562

3
dd229c5f57bf.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8fc1bca4bb251a6d2778e0fb36eb1c9a456361bbb2a020933a5d7dee7bc1781a
size 45321313

3
eaa4074a7e39.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6310688708a9ec6896a9ba8ba13f05930963e8526b6ff5c345a31a7dd28bfe40
size 7639011

25
java-1_8_0-openjdk.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Mon Sep 29 06:36:58 UTC 2014 - fstrba@suse.com
- Build template jvm interpreter on ppc64le
* It was ported for this architecture in jdk8u49-b06
- Build depend on the generic java-bootstrap-devel
* Allows to build against java-1_7_0-openjdk-bootstrap
- Reformat the spec file with spec-cleaner
-------------------------------------------------------------------
Fri Sep 26 07:35:47 UTC 2014 - fstrba@suse.com
- Upgrade to upstream tag jdk8u40-b07
* Unstable snapshot in view of jdk8u40 release
- Removed patch: aarch64-jni-update.patch
* Upstreamed changes
- Modified patch: aarch64-misc.patch
* Do not patch generated-configure.sh that is anyway regenerated.
- Modified patch: system-libjpeg.patch
* Do not patch generated-configure.sh that is anyway regenerated.
* Rediff to apply cleanly
- Modified patches: link-with-as-needed.patch,
system-giflib5.patch, system-lcms.patch, system-libpng.patch
* Rediff to apply cleanly
-------------------------------------------------------------------
Tue Sep 23 08:16:11 UTC 2014 - fstrba@suse.com

62
java-1_8_0-openjdk.spec
View File

@ -28,21 +28,21 @@
%global syslibdir %{_libdir}
%global archname %{name}
# Standard JPackage naming and versioning defines.
%global updatever 20
%global buildver b26
%global updatever 40
%global buildver b07
%global root_project jdk8u
%global root_repository jdk8u20
%global root_revision d1a7ea2c3e10
%global corba_revision 37bde23c96f6
%global hotspot_revision eaa4074a7e39
%global jaxp_revision 938b9d502c2b
%global jaxws_revision 7025a2c10ea4
%global jdk_revision dd229c5f57bf
%global langtools_revision 5e6d409a7232
%global nashorn_revision a23ac9db4227
%global root_repository jdk8u
%global root_revision cf9afcfcb7a4
%global corba_revision 0d09cb188d39
%global hotspot_revision b63d0e8bfc07
%global jaxp_revision b2210de1587b
%global jaxws_revision 3857b4b27e22
%global jdk_revision 07f0e22b5c23
%global langtools_revision 2fa3858a281f
%global nashorn_revision 0032961e1866
%global aarch64_project aarch64-port
%global aarch64_repository jdk8
%global aarch64_hotspot_revision b319f337ea31
%global aarch64_hotspot_revision 68cf8e406ce5
%global icedtea_sound_version 1.0.1
# priority must be 6 digits in total
%global priority 180%{updatever}
@ -63,6 +63,7 @@
%global cacerts %{_jvmdir}/%{jredir}/lib/security/cacerts
# real file made by update-ca-certificates
%global javacacerts %{_var}/lib/ca-certificates/java-cacerts
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
%ifarch x86_64
%global archinstall amd64
%endif
@ -136,7 +137,7 @@
%global tapsetdir %{tapsetroot}/tapset/%{_build_cpu}
%endif
Name: java-1_8_0-openjdk
Version: %{javaver}.%{updatever}
Version: %{javaver}.%{updatever}~%{buildver}
Release: 0
Summary: OpenJDK Runtime Environment
License: Apache-1.1 and Apache-2.0 and GPL-1.0+ and GPL-2.0 and GPL-2.0-with-classpath-exception and LGPL-2.0 and MPL-1.0 and MPL-1.1 and SUSE-Public-Domain and W3C
@ -168,8 +169,6 @@ Source14: TestCryptoLevel.java
Source100: config.guess
Source101: config.sub
# RPM/distribution specific patches
# Backport JVM_GetTemporaryDirectory jni export for aarch64
Patch0: aarch64-jni-update.patch
# RHBZ 1015432
Patch2: 1015432.patch
# Restrict access to java-atk-wrapper classes
@ -250,21 +249,20 @@ Provides: java = %{javaver}
Provides: java-%{javaver} = %{version}-%{release}
Provides: java-openjdk = %{version}-%{release}
Provides: jre = %{javaver}
%ifarch %{ix86} ppc
Provides: jre-32 = %{javaver}
%endif
%ifarch x86_64
Provides: jre-64 = %{javaver}
%endif
Provides: jre-%{javaver} = %{version}-%{release}
Provides: jre-%{javaver}-openjdk = %{version}-%{release}
Provides: jre-openjdk = %{version}-%{release}
# Standard JPackage extensions provides.
Provides: java-fonts = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
%ifarch %ix86 ppc
Provides: jre-32 = %{javaver}
%endif
%ifarch x86_64
Provides: jre-64 = %{javaver}
%endif
%if %{bootcycle}
BuildRequires: java-devel >= 1.6.0
BuildRequires: java-bootstrap-devel >= 1.6.0
%else
BuildRequires: java-devel >= %{javaver}
%endif
@ -411,6 +409,7 @@ need to.
%setup -q -D -n %{root_repository}-%{root_revision} -T -a 5
%setup -q -D -n %{root_repository}-%{root_revision} -T -a 6
%setup -q -D -n %{root_repository}-%{root_revision} -T -a 7
%if %{with_pulseaudio}
%setup -q -D -n %{root_repository}-%{root_revision} -T -a 9
%endif
@ -418,6 +417,7 @@ need to.
# Set up the build tree using the subrepository tarballs
pwd
mv corba-%{corba_revision} corba
%ifarch %{aarch64}
mv hotspot-%{aarch64_hotspot_revision} hotspot
%else
@ -428,6 +428,7 @@ mv jaxws-%{jaxws_revision} jaxws
mv jdk-%{jdk_revision} jdk
mv langtools-%{langtools_revision} langtools
mv nashorn-%{nashorn_revision} nashorn
%if %{with_pulseaudio}
mv icedtea-sound-%{icedtea_sound_version} icedtea-sound
%endif
@ -453,9 +454,6 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
%patch204 -p1
%patch205 -p1
%ifarch %{aarch64}
%patch0 -p1
%endif
%patch2 -p1
%patch3 -p1
%patch4 -p1
@ -472,6 +470,7 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
%patch99 -p1
# s390 build fixes
%ifarch s390
%patch100 -p1
%patch101 -p1
@ -483,6 +482,7 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
%endif
# Extract systemtap tapsets
%if %{with_systemtap}
tar xzf %{SOURCE10}
@ -492,6 +492,7 @@ for file in tapset/*.in; do
OUTPUT_FILE=`echo $file | sed -e s:\.in$::g`
sed -e s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{jredir}/lib/%{archinstall}/server/libjvm.so:g $file > $file.1
# TODO find out which architectures other than ix86 have a client vm
%ifarch %ix86
sed -e s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{jredir}/lib/%{archinstall}/client/libjvm.so:g $file.1 > $OUTPUT_FILE
%else
@ -523,9 +524,11 @@ export ZLIB_LIBS="-L/%{_lib} -lz"
%endif
# Build IcedTea and OpenJDK.
%ifarch s390x sparc64 alpha ppc64 ppc64le %{aarch64}
export ARCH_DATA_MODEL=64
%endif
%ifarch alpha
export CFLAGS="$CFLAGS -mieee"
%endif
@ -556,9 +559,6 @@ bash ../configure \
--with-stdc++lib=dynamic \
%ifnarch %{arm}
--with-num-cores="$NUM_PROC" \
%endif
%ifarch ppc64le
--with-jvm-interpreter=cpp \
%endif
--with-extra-cflags="-fno-devirtualize" \
--with-extra-cxxflags="-fno-devirtualize"
@ -590,6 +590,7 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir}/%{imagesdir}/j2sdk-image
if [ -f %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts ]; then
rm %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts
fi
%if 0%{?suse_version} < 1130
# ========== a default keystore ==========
# a cacerts generation - 11.3+ use java-ca-certificates package
@ -888,7 +889,6 @@ then
fi
%if 0%{?suse_version} >= 1130
%posttrans headless
# bnc#781690#c11: don't trust user defined JAVA_HOME and use the current VM
# XXX: this might conflict between various versions of openjdk
@ -1117,6 +1117,7 @@ fi
%{_jvmdir}/%{sdkdir}/bin/*
%{_jvmdir}/%{sdkdir}/include/*
%{_jvmdir}/%{sdkdir}/lib/*
%if %{with_systemtap}
%{_jvmdir}/%{sdkdir}/tapset/*.stp
%endif
@ -1152,6 +1153,7 @@ fi
%{_mandir}/man1/wsgen-%{sdklnk}.1*
%{_mandir}/man1/wsimport-%{sdklnk}.1*
%{_mandir}/man1/xjc-%{sdklnk}.1*
%if %{with_systemtap}
%{tapsetroot}
%endif

10
link-with-as-needed.patch
View File

@ -1,5 +1,5 @@
--- jdk8/jdk/make/CompileLaunchers.gmk
+++ jdk8/jdk/make/CompileLaunchers.gmk
--- jdk8/jdk/make/CompileLaunchers.gmk 2014-09-26 08:53:47.340118668 +0200
+++ jdk8/jdk/make/CompileLaunchers.gmk 2014-09-26 08:54:18.702392301 +0200
@@ -427,7 +427,7 @@
# binary (at least on linux) which causes the size to differ between old and new build.
ifeq ($(USE_EXTERNAL_LIBZ), true)
@ -21,9 +21,9 @@
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
PROGRAM := unpack200, \
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk
+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk
@@ -762,10 +762,10 @@
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:53:47.341118645 +0200
+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:54:22.383307050 +0200
@@ -760,10 +760,10 @@
$(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
$(BUILD_LIBJAVAJPEG_HEADERS), \
MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \

6
system-giflib5.patch
View File

@ -1,6 +1,6 @@
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
@@ -316,9 +316,18 @@
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2014-09-26 08:52:13.001303676 +0200
+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2014-09-26 08:53:14.143887542 +0200
@@ -318,9 +318,18 @@
int
SplashDecodeGifStream(Splash * splash, SplashStream * stream)
{

28
system-lcms.patch
View File

@ -1,10 +1,6 @@
# DP: taken from http://icedtea.classpath.org/wiki/IcedTea_Patches_for_OpenJDK_8
Index: b/common/autoconf/libraries.m4
===================================================================
--- jdk8/common/autoconf/libraries.m4
+++ jdk8/common/autoconf/libraries.m4
@@ -679,6 +679,46 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
--- jdk8/common/autoconf/libraries.m4 2014-09-26 08:49:01.572737814 +0200
+++ jdk8/common/autoconf/libraries.m4 2014-09-26 08:50:22.896853996 +0200
@@ -679,6 +679,46 @@
###############################################################################
#
@ -51,11 +47,9 @@ Index: b/common/autoconf/libraries.m4
# Check for the png library
#
Index: b/jdk/make/lib/Awt2dLibraries.gmk
===================================================================
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk
+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk
@@ -670,8 +670,8 @@ endif
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:49:00.981751504 +0200
+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:50:22.897853978 +0200
@@ -669,8 +669,8 @@
##########################################################################################
# TODO: Update awt lib path when awt is converted
@ -66,7 +60,7 @@ Index: b/jdk/make/lib/Awt2dLibraries.gmk
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
LANG := C, \
@@ -689,19 +689,19 @@ $(eval $(call SetupNativeCompilation,BUI
@@ -688,19 +688,19 @@
LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
@ -92,11 +86,9 @@ Index: b/jdk/make/lib/Awt2dLibraries.gmk
##########################################################################################
Index: b/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
@@ -207,7 +207,7 @@ public class LCMS implements PCMM {
--- jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java 2014-09-26 08:49:00.646759264 +0200
+++ jdk8/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java 2014-09-26 08:50:22.897853978 +0200
@@ -207,7 +207,7 @@
* disposer frameworks
*/
System.loadLibrary("awt");

172
system-libjpeg.patch
View File

@ -1,139 +1,5 @@
--- jdk8/common/autoconf/generated-configure.sh 2014-06-18 21:34:07.000000000 +0200
+++ jdk8/common/autoconf/generated-configure.sh 2014-07-08 18:47:15.372657941 +0200
@@ -1058,6 +1058,7 @@
with_alsa
with_alsa_include
with_alsa_lib
+with_libjpeg
with_giflib
with_zlib
with_stdc__lib
@@ -1828,6 +1829,8 @@
headers under PATH/include)
--with-alsa-include specify directory for the alsa include files
--with-alsa-lib specify directory for the alsa library
+ --with-libjpeg use libjpeg from build system or OpenJDK source
+ (system, bundled) [bundled]
--with-giflib use giflib from build system or OpenJDK source
(system, bundled) [bundled]
--with-zlib use zlib from build system or OpenJDK source
@@ -3868,7 +3871,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1397150809
+DATE_WHEN_GENERATED=1404288415
###############################################################################
#
@@ -34911,10 +34919,43 @@
# Check for the jpeg library
#
- USE_EXTERNAL_LIBJPEG=true
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
-$as_echo_n "checking for main in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_main+:} false; then :
+
+# Check whether --with-libjpeg was given.
+if test "${with_libjpeg+set}" = set; then :
+ withval=$with_libjpeg;
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for which libjpeg to use" >&5
+$as_echo_n "checking for which libjpeg to use... " >&6; }
+
+ # default is bundled
+ DEFAULT_LIBJPEG=bundled
+
+ #
+ # if user didn't specify, use DEFAULT_LIBJPEG
+ #
+ if test "x${with_libjpeg}" = "x"; then
+ with_libjpeg=${DEFAULT_LIBJPEG}
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libjpeg}" >&5
+$as_echo "${with_libjpeg}" >&6; }
+
+ if test "x${with_libjpeg}" = "xbundled"; then
+ USE_EXTERNAL_LIBJPEG=false
+ elif test "x${with_libjpeg}" = "xsystem"; then
+ ac_fn_cxx_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
+if test "x$ac_cv_header_jpeglib_h" = xyes; then :
+
+else
+ as_fn_error $? "--with-libjpeg=system specified, but jpeglib.h not found!" "$LINENO" 5
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_CreateDecompress in -ljpeg" >&5
+$as_echo_n "checking for jpeg_CreateDecompress in -ljpeg... " >&6; }
+if ${ac_cv_lib_jpeg_jpeg_CreateDecompress+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -34922,27 +34963,33 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jpeg_CreateDecompress ();
int
main ()
{
-return main ();
+return jpeg_CreateDecompress ();
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
- ac_cv_lib_jpeg_main=yes
+ ac_cv_lib_jpeg_jpeg_CreateDecompress=yes
else
- ac_cv_lib_jpeg_main=no
+ ac_cv_lib_jpeg_jpeg_CreateDecompress=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
-$as_echo "$ac_cv_lib_jpeg_main" >&6; }
-if test "x$ac_cv_lib_jpeg_main" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_CreateDecompress" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_CreateDecompress" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_CreateDecompress" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBJPEG 1
_ACEOF
@@ -34950,10 +34997,13 @@
LIBS="-ljpeg $LIBS"
else
- USE_EXTERNAL_LIBJPEG=false
- { $as_echo "$as_me:${as_lineno-$LINENO}: Will use jpeg decoder bundled with the OpenJDK source" >&5
-$as_echo "$as_me: Will use jpeg decoder bundled with the OpenJDK source" >&6;}
+ as_fn_error $? "--with-libjpeg=system specified, but no libjpeg found" "$LINENO" 5
+fi
+
+ USE_EXTERNAL_LIBJPEG=true
+ else
+ as_fn_error $? "Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'" "$LINENO" 5
fi
--- jdk8/common/autoconf/libraries.m4 2014-06-18 21:34:07.000000000 +0200
+++ jdk8/common/autoconf/libraries.m4 2014-07-08 18:47:15.372657941 +0200
--- jdk8/common/autoconf/libraries.m4 2014-09-26 08:39:36.237838684 +0200
+++ jdk8/common/autoconf/libraries.m4 2014-09-26 08:40:42.582300554 +0200
@@ -608,11 +608,36 @@
# Check for the jpeg library
#
@ -175,9 +41,9 @@
AC_SUBST(USE_EXTERNAL_LIBJPEG)
###############################################################################
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-06-23 01:01:34.000000000 +0200
+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-07-08 18:47:15.373657942 +0200
@@ -705,18 +705,20 @@
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:39:35.205862611 +0200
+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:40:42.583300530 +0200
@@ -704,18 +704,20 @@
##########################################################################################
@ -204,7 +70,7 @@
endif
endif
@@ -731,37 +733,50 @@
@@ -730,37 +732,50 @@
# $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
# \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
# ifeq ($(CC_43_OR_NEWER), 1)
@ -269,7 +135,7 @@
##########################################################################################
@@ -1207,6 +1222,13 @@
@@ -1206,6 +1221,13 @@
GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
endif
@ -283,7 +149,7 @@
ifneq ($(OPENJDK_TARGET_OS), macosx)
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
else
@@ -1269,11 +1291,13 @@
@@ -1268,11 +1290,13 @@
EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
LANG := C, \
OPTIMIZATION := LOW, \
@ -299,8 +165,8 @@
LDFLAGS_SUFFIX_solaris := -lc, \
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS := $(RC_FLAGS) \
--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2014-06-23 01:01:34.000000000 +0200
+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2014-07-08 18:47:15.373657942 +0200
--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2014-09-26 08:39:35.086865370 +0200
+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2014-09-26 08:40:42.583300530 +0200
@@ -89,7 +89,7 @@
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() {
@ -310,8 +176,8 @@
return null;
}
});
--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2014-06-23 01:01:34.000000000 +0200
+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2014-07-08 18:47:15.374657940 +0200
--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2014-09-26 08:39:35.086865370 +0200
+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2014-09-26 08:40:42.584300507 +0200
@@ -179,7 +179,7 @@
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() {
@ -321,8 +187,8 @@
return null;
}
});
--- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2014-06-23 01:01:34.000000000 +0200
+++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2014-07-08 18:47:15.374657940 +0200
--- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2014-09-26 08:39:34.084888603 +0200
+++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2014-09-26 08:40:42.584300507 +0200
@@ -56,7 +56,7 @@
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void>() {
@ -332,8 +198,8 @@
return null;
}
});
--- jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2014-06-23 01:01:34.000000000 +0200
+++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2014-07-08 18:47:15.374657940 +0200
--- jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2014-09-26 08:39:35.138864165 +0200
+++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2014-09-26 08:40:42.584300507 +0200
@@ -51,7 +51,7 @@
/* headers from the JPEG library */
@ -343,8 +209,8 @@
#undef MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b))
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2014-06-23 01:01:34.000000000 +0200
+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2014-07-08 19:15:42.773049037 +0200
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2014-09-26 08:39:35.138864165 +0200
+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2014-09-26 08:40:42.584300507 +0200
@@ -25,9 +25,9 @@
#include "splashscreen_impl.h"
@ -358,7 +224,7 @@
#include <setjmp.h>
@@ -107,11 +107,11 @@
@@ -113,11 +113,11 @@
if (cinfo->src == NULL) { /* first time for this JPEG object? */
cinfo->src = (struct jpeg_source_mgr *)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo,

26
system-libpng.patch
View File

@ -1,6 +1,6 @@
--- jdk8/common/autoconf/libraries.m4
+++ jdk8/common/autoconf/libraries.m4
@@ -679,6 +679,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
--- jdk8/common/autoconf/libraries.m4 2014-09-26 08:45:01.057310067 +0200
+++ jdk8/common/autoconf/libraries.m4 2014-09-26 08:46:38.602049970 +0200
@@ -679,6 +679,47 @@
###############################################################################
#
@ -48,9 +48,9 @@
# Check for the zlib library
#
--- jdk8/common/autoconf/spec.gmk.in
+++ jdk8/common/autoconf/spec.gmk.in
@@ -555,6 +555,7 @@ endif
--- jdk8/common/autoconf/spec.gmk.in 2014-09-26 08:45:01.057310067 +0200
+++ jdk8/common/autoconf/spec.gmk.in 2014-09-26 08:46:38.603049945 +0200
@@ -555,6 +555,7 @@
ENABLE_JFR=@ENABLE_JFR@
ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
@ -58,9 +58,9 @@
USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk
+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk
@@ -1213,7 +1213,6 @@ endif
--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:45:00.475323552 +0200
+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:46:38.603049945 +0200
@@ -1211,7 +1211,6 @@
ifndef BUILD_HEADLESS_ONLY
LIBSPLASHSCREEN_DIRS := \
$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
@ -68,7 +68,7 @@
$(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
ifeq ($(USE_EXTERNAL_LIBGIF), true)
@@ -1230,6 +1229,13 @@ ifndef BUILD_HEADLESS_ONLY
@@ -1228,6 +1227,13 @@
LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
endif
@ -82,7 +82,7 @@
ifneq ($(OPENJDK_TARGET_OS), macosx)
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
else
@@ -1293,12 +1299,12 @@ ifndef BUILD_HEADLESS_ONLY
@@ -1291,12 +1297,12 @@
LANG := C, \
OPTIMIZATION := LOW, \
CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
@ -97,8 +97,8 @@
LDFLAGS_SUFFIX_solaris := -lc, \
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS := $(RC_FLAGS) \
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2014-09-26 08:45:00.414324966 +0200
+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2014-09-26 08:46:38.603049945 +0200
@@ -25,8 +25,7 @@
#include "splashscreen_impl.h"