X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenjdk9.git;a=blobdiff_plain;f=openjdk8.spec;h=a932527712acb3c251c7c5696bac4aae62df2c6c;hp=ecc08a7936dc2572f7db50ca9afb65ee6585bd33;hb=8327989;hpb=39213195da97c6de13c018549cd00774512c0264 diff --git a/openjdk8.spec b/openjdk8.spec index ecc08a7..a932527 100644 --- a/openjdk8.spec +++ b/openjdk8.spec @@ -1,12 +1,12 @@ # +# NOTE: versioning and release status might not be clear +# http://openjdk.java.net/projects/jdk8u/ gives some information +# about current status of the 'updates' +# # TODO: -# - fix BuildRequires -# - fix build with system giflib # - use other system libs (libsctp?) -# - build alternative VM for x32 # - include icedtea-sound? -# - port PLD-specific changes from icedtea7? -# - '*** WARNING: no sources found for ...' +# - consider zeroshark (LLVM-based JIT) for x32 %bcond_with bootstrap # build a bootstrap version, using icedtea6 %bcond_without cacerts # don't include the default CA certificates @@ -22,30 +22,30 @@ # JDK/JRE version, as returned with `java -version`, '_' replaced with '.' %define _jdkversion 1.8.0.internal +%define ver_u 66 +%define ver_b 02 Summary: Open-source implementation of the Java Platform, Standard Edition Summary(pl.UTF-8): Wolnoźródłowa implementacja Java 8 SE Name: openjdk8 -%define ver_u 66 -%define ver_b 02 Version: 8u%{ver_u}.b%{ver_b} -Release: 0.1 +Release: 2 License: GPL v2 Group: Development/Languages/Java -Source0: openjdk8-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 +Source0: %{name}-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 # Source0-md5: 1d115662e175470270e89a4da8e0fce2 -Source1: openjdk8-corba-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 +Source1: %{name}-corba-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 # Source1-md5: e14d8f51b9ca30d798094a2867f3f5d0 -Source2: openjdk8-hotspot-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 +Source2: %{name}-hotspot-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 # Source2-md5: b49a7b7f2db5b07306b7b5739e87ccc0 -Source3: openjdk8-jaxp-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 +Source3: %{name}-jaxp-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 # Source3-md5: 6bd5ae187272a209439d1a95ac6c9025 -Source4: openjdk8-jaxws-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 +Source4: %{name}-jaxws-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 # Source4-md5: 15e6a93009bdc73194e7118988d5ab8d -Source5: openjdk8-jdk-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 +Source5: %{name}-jdk-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 # Source5-md5: 74f2cf3815659b83993c4187e7fc4f6b -Source6: openjdk8-langtools-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 +Source6: %{name}-langtools-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 # Source6-md5: de5c9b5fdbcd75028b71ed667d4b99d2 -Source7: openjdk8-nashorn-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 +Source7: %{name}-nashorn-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 # Source7-md5: 7da4e88349cfc45ee9726eaa4386be03 Source10: make-cacerts.sh Patch0: adjust-mflags.patch @@ -56,19 +56,21 @@ Patch4: system-libjpeg.patch Patch5: system-libpng.patch Patch6: system-lcms.patch Patch7: system-pcsclite.patch +Patch8: x32.patch +Patch9: current_stack_pointer.patch URL: http://openjdk.java.net/ +BuildRequires: /usr/bin/jar BuildRequires: alsa-lib-devel BuildRequires: ant BuildRequires: autoconf BuildRequires: bash %{?with_cacerts:BuildRequires: ca-certificates-update} BuildRequires: cups-devel -BuildRequires: /usr/bin/jar BuildRequires: freetype-devel >= 2.3 BuildRequires: gawk -#BuildRequires: giflib-devel >= 5.1 +BuildRequires: giflib-devel >= 5.1 BuildRequires: glibc-misc -%buildrequires_jdk +%{?buildrequires_jdk} BuildRequires: lcms2-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -94,25 +96,25 @@ Suggests: %{name}-jre-X11 Suggests: icedtea-web Obsoletes: icedtea6 Obsoletes: icedtea7 -Obsoletes: java5-sun -Obsoletes: java5-sun-jre -Obsoletes: java5-sun-jre-jdbc -Obsoletes: java5-sun-jre-X11 -Obsoletes: java5-sun-tools Obsoletes: java-gcj-compat Obsoletes: java-gcj-compat-devel Obsoletes: java-sun Obsoletes: java-sun-demos Obsoletes: java-sun-jre +Obsoletes: java-sun-jre-X11 Obsoletes: java-sun-jre-alsa Obsoletes: java-sun-jre-jdbc -Obsoletes: java-sun-jre-X11 Obsoletes: java-sun-tools +Obsoletes: java5-sun +Obsoletes: java5-sun-jre +Obsoletes: java5-sun-jre-X11 +Obsoletes: java5-sun-jre-jdbc +Obsoletes: java5-sun-tools Obsoletes: oracle-java7 Obsoletes: oracle-java7-jre +Obsoletes: oracle-java7-jre-X11 Obsoletes: oracle-java7-jre-alsa Obsoletes: oracle-java7-jre-jdbc -Obsoletes: oracle-java7-jre-X11 Obsoletes: oracle-java7-tools BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -166,9 +168,9 @@ Obsoletes: java-blackdown Obsoletes: java-gcj-compat-devel Obsoletes: java-sun Obsoletes: java5-sun -Obsoletes: oracle-java7 Obsoletes: jdk Obsoletes: kaffe +Obsoletes: oracle-java7 %description jdk This package symlinks OpenJDK development tools provided by @@ -186,7 +188,7 @@ Summary: OpenJDK - software development kit Summary(pl.UTF-8): Kod OpenJDK - środowisko programistyczne Group: Development/Languages/Java Requires: %{name}-jre-base = %{version}-%{release} -Requires: jpackage-utils >= 0:1.7.5-4 +Requires: jpackage-utils >= 0:1.7.5-7 Provides: jdk(%{name}) %description jdk-base @@ -231,8 +233,8 @@ Obsoletes: java(jsse) Obsoletes: java-gcj-compat Obsoletes: java-sun-jre Obsoletes: java5-sun-jre -Obsoletes: oracle-java7-jre Obsoletes: jre +Obsoletes: oracle-java7-jre %description jre This package symlinks OpenJDK runtime environment tools provided by @@ -269,7 +271,7 @@ wolnego oprogramowania. Summary: OpenJDK - runtime environment Summary(pl.UTF-8): OpenJDK - środowisko uruchomieniowe Group: Development/Languages/Java -Requires: jpackage-utils >= 0:1.7.5-4 +Requires: jpackage-utils >= 0:1.7.5-7 Provides: jre(%{name}) %description jre-base @@ -421,6 +423,8 @@ done %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build # Make sure we have /proc mounted - otherwise idlc will fail later. @@ -430,6 +434,7 @@ if [ ! -f /proc/self/stat ]; then fi cd common/autoconf +rm generated-configure.sh %{__autoconf} -o generated-configure.sh cd ../.. @@ -446,11 +451,16 @@ export SHELL=/bin/bash chmod a+x configure +# disable-debug-symbols so openjdk debuginfo handling won't conflict with ours %configure \ +%ifarch x32 + --with-jvm-variants=zero \ +%endif --with-extra-cflags="%{rpmcflags}" \ --with-extra-cxxflags="%{rpmcxxflags}" \ --with-extra-ldflags="%{rpmldflags}" \ - --with-giflib=bundled \ + --disable-debug-symbols \ + --with-giflib=system \ --with-libjpeg=system \ --with-libpng=system \ --with-lcms=system \ @@ -459,13 +469,18 @@ chmod a+x configure specdir="$(dirname build/*-release/spec.gmk)" cat > $specdir/custom-spec.gmk <