X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=openjdk8.spec;h=a99256f43c0da7bbcb2afa26ba7220df8f9cfa49;hb=b2950e845c8ac4829fcc4805525a75268c2ef0cd;hp=e7764c6de74c58dcef5314ea796d4cf59da5c0d1;hpb=d8978afbc4ac66a4268cf9f070ea3597afcc4a0e;p=packages%2Fopenjdk9.git diff --git a/openjdk8.spec b/openjdk8.spec index e7764c6..a99256f 100644 --- a/openjdk8.spec +++ b/openjdk8.spec @@ -1,10 +1,11 @@ # # TODO: -# - make it build -# - make it install # - 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? %bcond_with bootstrap # build a bootstrap version, using icedtea6 %bcond_without cacerts # don't include the default CA certificates @@ -16,9 +17,9 @@ %endif # class data version seen with file(1) that this jvm is able to load -%define _classdataversion 51.0 +%define _classdataversion 52.0 # JDK/JRE version, as returned with `java -version`, '_' replaced with '.' -%define _jdkversion 1.7.0.85 +%define _jdkversion 1.8.0.internal Summary: Open-source implementation of the Java Platform, Standard Edition Summary(pl.UTF-8): Wolnoźródłowa implementacja Java 8 SE @@ -30,29 +31,34 @@ Release: 0.1 License: GPL v2 Group: Development/Languages/Java Source0: openjdk8-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 -# Source0-md5: 7ae143bc2b840f1bfbfa15a1dcbcc371 +# Source0-md5: 1d115662e175470270e89a4da8e0fce2 Source1: openjdk8-corba-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 -# Source1-md5: a54c4b046d4f9b7dc0e64b79b734d2f3 +# Source1-md5: e14d8f51b9ca30d798094a2867f3f5d0 Source2: openjdk8-hotspot-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 -# Source2-md5: 1368abb3e02079bb7cd802d2bef136b4 +# Source2-md5: b49a7b7f2db5b07306b7b5739e87ccc0 Source3: openjdk8-jaxp-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 -# Source3-md5: dccca275bad921fc036221ba36f9596e +# Source3-md5: 6bd5ae187272a209439d1a95ac6c9025 Source4: openjdk8-jaxws-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 -# Source5-md5: faf2d077d9c41a8c11a2b038fb5d2e50 +# Source4-md5: 15e6a93009bdc73194e7118988d5ab8d Source5: openjdk8-jdk-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 -# Source5-md5: a14e4f9a26a229fdc59dc77cf9754fee +# Source5-md5: 74f2cf3815659b83993c4187e7fc4f6b Source6: openjdk8-langtools-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 -# Source6-md5: 6f6dd27e4ca48a49c0c2ec16310c44f3 +# Source6-md5: de5c9b5fdbcd75028b71ed667d4b99d2 Source7: openjdk8-nashorn-jdk8u%{ver_u}-b%{ver_b}.tar.bz2 -# Source7-md5: 19581a68b0ffa30d8a23f384fcb8c91d +# Source7-md5: 7da4e88349cfc45ee9726eaa4386be03 Source10: make-cacerts.sh Patch0: adjust-mflags.patch Patch1: format_strings.patch +Patch2: CompileDemos.patch +Patch3: libpath.patch +Patch4: system-libjpeg.patch +Patch5: system-libpng.patch +Patch6: system-lcms.patch +Patch7: system-pcsclite.patch URL: http://openjdk.java.net/ BuildRequires: alsa-lib-devel BuildRequires: ant BuildRequires: autoconf -BuildRequires: automake BuildRequires: bash %{?with_cacerts:BuildRequires: ca-certificates-update} BuildRequires: cups-devel @@ -62,8 +68,11 @@ BuildRequires: gawk #BuildRequires: giflib-devel >= 5.1 BuildRequires: glibc-misc %buildrequires_jdk +BuildRequires: lcms2-devel BuildRequires: libjpeg-devel +BuildRequires: libpng-devel BuildRequires: lsb-release +BuildRequires: pcsc-lite-devel BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.557 BuildRequires: unzip @@ -400,11 +409,17 @@ Przykłady dla OpenJDK. %setup -qn jdk8u-jdk8u%{ver_u}-b%{ver_b} -a1 -a2 -a3 -a4 -a5 -a6 -a7 for d in *-jdk8u*-b* ; do - ln -s "$d" "${d%%-jdk8u*-b*}" + mv "$d" "${d%%-jdk8u*-b*}" done %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build # Make sure we have /proc mounted - otherwise idlc will fail later. @@ -413,30 +428,52 @@ if [ ! -f /proc/self/stat ]; then exit 1 fi -unset JAVA_HOME -export SHELL=/bin/bash +cd common/autoconf +%{__autoconf} -o generated-configure.sh +cd ../.. mkdir -p build-bin -export PATH="$(pwd)/build-bin:$PATH" + +# use the specified %%use_jdk +export JAVA_HOME=%{java_home} +export PATH="$JAVA_HOME/bin:$PATH" + +# unset CLASSPATH to be safe, gnustep puts garbage there, which openjdk hates +unset CLASSPATH + +export SHELL=/bin/bash chmod a+x configure +# disable-debug-symbols so openjdk debuginfo handling won't conflict with ours %configure \ --with-extra-cflags="%{rpmcflags}" \ --with-extra-cxxflags="%{rpmcxxflags}" \ --with-extra-ldflags="%{rpmldflags}" \ + --disable-debug-symbols \ --with-giflib=bundled \ + --with-libjpeg=system \ + --with-libpng=system \ + --with-lcms=system \ + --with-libpcsclite=system \ --with-zlib=system specdir="$(dirname build/*-release/spec.gmk)" cat > $specdir/custom-spec.gmk <