diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : openjdk-8 version : 8.232 -release : 17 +release : 18 source : - https://getsol.us/sources/java/jdk8u232-ga.tar.bz2 : 23abb7e548611b19fc24802165d27d217657d6648b4688573a0430168e86ea77 - https://getsol.us/sources/java/corba-u232-ga.tar.bz2 : 9958a19a9064a18e4cf249734ff1c03ad30444bff277d560027d02b8be5c3a68 @@ -29,17 +29,14 @@ - p7zip setup : | # Prep input tarballs - unset LD_AS_NEEDED - _SOLJVM_VERSION="u232-ga" + SOLJVM_VERSION="u232-ga" for tarball in corba hotspot jaxp jaxws langtools jdk nashorn; do mkdir -pv ${tarball} && - tar -xf $sources/${tarball}-${_SOLJVM_VERSION}.tar.bz2 --strip-components=1 -C ${tarball} + tar -xf $sources/${tarball}-${SOLJVM_VERSION}.tar.bz2 --strip-components=1 -C ${tarball} done - unset _SOLJVM_VERSION - unset JAVA_HOME # Now configure - export SANEFLAGS="-std=c++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse" + SANEFLAGS="-std=c++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse" bash ./configure --prefix="$installdir/usr" \ --with-update-version=232 \ --with-build-number=ga \ @@ -56,33 +53,24 @@ unset LD_AS_NEEDED make SCTP_WERROR= DISABLE_HOTSPOT_OS_VERSION_CHECK=ok all WARNINGS_ARE_ERRORS= install : | - install -d -D -m 00755 $installdir/%libdir% make install - # Binaries - rm -rf $installdir/usr/bin/* - mv $installdir/usr/jvm/openjdk-1.8.0_232-solus $installdir/%libdir%/openjdk-8 - rmdir $installdir/usr/jvm - pushd $installdir/usr/bin - for i in $installdir/%libdir%/openjdk-8/bin/*; do - ln -sf %libdir%/openjdk-8/bin/`basename $i` . - done - popd + # Remove symlinks to binaries + rm -rf $installdir/usr/bin - # Docs - install -m 00644 -D LICENSE $installdir/usr/share/doc/openjdk-8/LICENSE - - # Move into build dir - pushd build/linux-x86_64-normal-server-release + # Rename the library directory + install -dm00755 $installdir/%libdir% + mv $installdir/usr/jvm/openjdk-*-solus $installdir/%libdir%/openjdk-8 + rmdir $installdir/usr/jvm - # Chuck the headers in - install -D -d -m 00755 $installdir/usr/include/openjdk-8 - cp -ra jdk/include/* $installdir/usr/include/openjdk-8/. + # Move header files into the correct path + install -dm00755 $installdir/usr/include + mv $installdir/usr/lib64/openjdk-8/include $installdir/usr/include/openjdk-8 - # Sort out the manpages - install -D -d -m 00755 $installdir/usr/share/man/man1 - install -m 00644 images/j2re-image/man/man1/*.1 $installdir/usr/share/man/man1/. - install -m 00644 images/j2sdk-image/man/man1/*.1 $installdir/usr/share/man/man1/. + # Sort out the manpages (with a "-8" suffix) + install -dm00755 $installdir/usr/share + mv $installdir/usr/lib64/openjdk-8/man $installdir/usr/share + find $installdir/usr/share/man -type f -exec rename -- .1 '-8.1' {} \; # Add java-jar.desktop into usable apps - install -D -m 00644 $pkgfiles/java-jar.desktop $installdir/usr/share/applications/java-jar.desktop + install -Dm00644 $pkgfiles/java-jar.desktop -t $installdir/usr/share/applications diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ openjdk-8 - Campbell Jones - me@serebit.com + Fabio Forni + livingsilver94.solus@redaril.me GPL-2.0-with-classpath-exception programming.java @@ -19,49 +19,6 @@ programming.java - /usr/bin/appletviewer - /usr/bin/clhsdb - /usr/bin/extcheck - /usr/bin/hsdb - /usr/bin/idlj - /usr/bin/jar - /usr/bin/jarsigner - /usr/bin/java - /usr/bin/java-rmi.cgi - /usr/bin/javac - /usr/bin/javadoc - /usr/bin/javah - /usr/bin/javap - /usr/bin/jcmd - /usr/bin/jconsole - /usr/bin/jdb - /usr/bin/jdeps - /usr/bin/jhat - /usr/bin/jinfo - /usr/bin/jjs - /usr/bin/jmap - /usr/bin/jps - /usr/bin/jrunscript - /usr/bin/jsadebugd - /usr/bin/jstack - /usr/bin/jstat - /usr/bin/jstatd - /usr/bin/keytool - /usr/bin/native2ascii - /usr/bin/orbd - /usr/bin/pack200 - /usr/bin/policytool - /usr/bin/rmic - /usr/bin/rmid - /usr/bin/rmiregistry - /usr/bin/schemagen - /usr/bin/serialver - /usr/bin/servertool - /usr/bin/tnameserv - /usr/bin/unpack200 - /usr/bin/wsgen - /usr/bin/wsimport - /usr/bin/xjc /usr/lib64/openjdk-8/ASSEMBLY_EXCEPTION /usr/lib64/openjdk-8/LICENSE /usr/lib64/openjdk-8/THIRD_PARTY_README @@ -372,14 +329,6 @@ /usr/lib64/openjdk-8/demo/scripting/jconsole-plugin/build.xml /usr/lib64/openjdk-8/demo/scripting/jconsole-plugin/jconsole-plugin.jar /usr/lib64/openjdk-8/demo/scripting/jconsole-plugin/src.zip - /usr/lib64/openjdk-8/include/classfile_constants.h - /usr/lib64/openjdk-8/include/jawt.h - /usr/lib64/openjdk-8/include/jdwpTransport.h - /usr/lib64/openjdk-8/include/jni.h - /usr/lib64/openjdk-8/include/jvmti.h - /usr/lib64/openjdk-8/include/jvmticmlr.h - /usr/lib64/openjdk-8/include/linux/jawt_md.h - /usr/lib64/openjdk-8/include/linux/jni_md.h /usr/lib64/openjdk-8/jre/ASSEMBLY_EXCEPTION /usr/lib64/openjdk-8/jre/LICENSE /usr/lib64/openjdk-8/jre/THIRD_PARTY_README @@ -538,87 +487,6 @@ /usr/lib64/openjdk-8/lib/orb.idl /usr/lib64/openjdk-8/lib/sa-jdi.jar /usr/lib64/openjdk-8/lib/tools.jar - /usr/lib64/openjdk-8/man/ja - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/appletviewer.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/extcheck.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/idlj.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jar.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jarsigner.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/java.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/javac.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/javadoc.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/javah.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/javap.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jcmd.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jconsole.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jdb.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jdeps.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jhat.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jinfo.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jjs.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jmap.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jps.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jrunscript.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jsadebugd.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jstack.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jstat.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/jstatd.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/keytool.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/native2ascii.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/orbd.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/pack200.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/policytool.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/rmic.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/rmid.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/rmiregistry.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/schemagen.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/serialver.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/servertool.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/tnameserv.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/unpack200.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/wsgen.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/wsimport.1 - /usr/lib64/openjdk-8/man/ja_JP.UTF-8/man1/xjc.1 - /usr/lib64/openjdk-8/man/man1/appletviewer.1 - /usr/lib64/openjdk-8/man/man1/extcheck.1 - /usr/lib64/openjdk-8/man/man1/idlj.1 - /usr/lib64/openjdk-8/man/man1/jar.1 - /usr/lib64/openjdk-8/man/man1/jarsigner.1 - /usr/lib64/openjdk-8/man/man1/java.1 - /usr/lib64/openjdk-8/man/man1/javac.1 - /usr/lib64/openjdk-8/man/man1/javadoc.1 - /usr/lib64/openjdk-8/man/man1/javah.1 - /usr/lib64/openjdk-8/man/man1/javap.1 - /usr/lib64/openjdk-8/man/man1/jcmd.1 - /usr/lib64/openjdk-8/man/man1/jconsole.1 - /usr/lib64/openjdk-8/man/man1/jdb.1 - /usr/lib64/openjdk-8/man/man1/jdeps.1 - /usr/lib64/openjdk-8/man/man1/jhat.1 - /usr/lib64/openjdk-8/man/man1/jinfo.1 - /usr/lib64/openjdk-8/man/man1/jjs.1 - /usr/lib64/openjdk-8/man/man1/jmap.1 - /usr/lib64/openjdk-8/man/man1/jps.1 - /usr/lib64/openjdk-8/man/man1/jrunscript.1 - /usr/lib64/openjdk-8/man/man1/jsadebugd.1 - /usr/lib64/openjdk-8/man/man1/jstack.1 - /usr/lib64/openjdk-8/man/man1/jstat.1 - /usr/lib64/openjdk-8/man/man1/jstatd.1 - /usr/lib64/openjdk-8/man/man1/keytool.1 - /usr/lib64/openjdk-8/man/man1/native2ascii.1 - /usr/lib64/openjdk-8/man/man1/orbd.1 - /usr/lib64/openjdk-8/man/man1/pack200.1 - /usr/lib64/openjdk-8/man/man1/policytool.1 - /usr/lib64/openjdk-8/man/man1/rmic.1 - /usr/lib64/openjdk-8/man/man1/rmid.1 - /usr/lib64/openjdk-8/man/man1/rmiregistry.1 - /usr/lib64/openjdk-8/man/man1/schemagen.1 - /usr/lib64/openjdk-8/man/man1/serialver.1 - /usr/lib64/openjdk-8/man/man1/servertool.1 - /usr/lib64/openjdk-8/man/man1/tnameserv.1 - /usr/lib64/openjdk-8/man/man1/unpack200.1 - /usr/lib64/openjdk-8/man/man1/wsgen.1 - /usr/lib64/openjdk-8/man/man1/wsimport.1 - /usr/lib64/openjdk-8/man/man1/xjc.1 /usr/lib64/openjdk-8/release /usr/lib64/openjdk-8/sample/README /usr/lib64/openjdk-8/sample/annotations/DependencyChecker/PluginChecker/src/checker/Device.java @@ -767,47 +635,87 @@ /usr/lib64/openjdk-8/sample/try-with-resources/src/ZipCat.java /usr/lib64/openjdk-8/src.zip /usr/share/applications/java-jar.desktop - /usr/share/doc/openjdk-8/LICENSE - /usr/share/man/man1/appletviewer.1 - /usr/share/man/man1/extcheck.1 - /usr/share/man/man1/idlj.1 - /usr/share/man/man1/jar.1 - /usr/share/man/man1/jarsigner.1 - /usr/share/man/man1/java.1 - /usr/share/man/man1/javac.1 - /usr/share/man/man1/javadoc.1 - /usr/share/man/man1/javah.1 - /usr/share/man/man1/javap.1 - /usr/share/man/man1/jcmd.1 - /usr/share/man/man1/jconsole.1 - /usr/share/man/man1/jdb.1 - /usr/share/man/man1/jdeps.1 - /usr/share/man/man1/jhat.1 - /usr/share/man/man1/jinfo.1 - /usr/share/man/man1/jjs.1 - /usr/share/man/man1/jmap.1 - /usr/share/man/man1/jps.1 - /usr/share/man/man1/jrunscript.1 - /usr/share/man/man1/jsadebugd.1 - /usr/share/man/man1/jstack.1 - /usr/share/man/man1/jstat.1 - /usr/share/man/man1/jstatd.1 - /usr/share/man/man1/keytool.1 - /usr/share/man/man1/native2ascii.1 - /usr/share/man/man1/orbd.1 - /usr/share/man/man1/pack200.1 - /usr/share/man/man1/policytool.1 - /usr/share/man/man1/rmic.1 - /usr/share/man/man1/rmid.1 - /usr/share/man/man1/rmiregistry.1 - /usr/share/man/man1/schemagen.1 - /usr/share/man/man1/serialver.1 - /usr/share/man/man1/servertool.1 - /usr/share/man/man1/tnameserv.1 - /usr/share/man/man1/unpack200.1 - /usr/share/man/man1/wsgen.1 - /usr/share/man/man1/wsimport.1 - /usr/share/man/man1/xjc.1 + /usr/share/man/ja + /usr/share/man/ja_JP.UTF-8/man1/appletviewer-8.1 + /usr/share/man/ja_JP.UTF-8/man1/extcheck-8.1 + /usr/share/man/ja_JP.UTF-8/man1/idlj-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jar-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jarsigner-8.1 + /usr/share/man/ja_JP.UTF-8/man1/java-8.1 + /usr/share/man/ja_JP.UTF-8/man1/javac-8.1 + /usr/share/man/ja_JP.UTF-8/man1/javadoc-8.1 + /usr/share/man/ja_JP.UTF-8/man1/javah-8.1 + /usr/share/man/ja_JP.UTF-8/man1/javap-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jcmd-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jconsole-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jdb-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jdeps-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jhat-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jinfo-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jjs-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jmap-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jps-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jrunscript-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jsadebugd-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jstack-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jstat-8.1 + /usr/share/man/ja_JP.UTF-8/man1/jstatd-8.1 + /usr/share/man/ja_JP.UTF-8/man1/keytool-8.1 + /usr/share/man/ja_JP.UTF-8/man1/native2ascii-8.1 + /usr/share/man/ja_JP.UTF-8/man1/orbd-8.1 + /usr/share/man/ja_JP.UTF-8/man1/pack200-8.1 + /usr/share/man/ja_JP.UTF-8/man1/policytool-8.1 + /usr/share/man/ja_JP.UTF-8/man1/rmic-8.1 + /usr/share/man/ja_JP.UTF-8/man1/rmid-8.1 + /usr/share/man/ja_JP.UTF-8/man1/rmiregistry-8.1 + /usr/share/man/ja_JP.UTF-8/man1/schemagen-8.1 + /usr/share/man/ja_JP.UTF-8/man1/serialver-8.1 + /usr/share/man/ja_JP.UTF-8/man1/servertool-8.1 + /usr/share/man/ja_JP.UTF-8/man1/tnameserv-8.1 + /usr/share/man/ja_JP.UTF-8/man1/unpack200-8.1 + /usr/share/man/ja_JP.UTF-8/man1/wsgen-8.1 + /usr/share/man/ja_JP.UTF-8/man1/wsimport-8.1 + /usr/share/man/ja_JP.UTF-8/man1/xjc-8.1 + /usr/share/man/man1/appletviewer-8.1 + /usr/share/man/man1/extcheck-8.1 + /usr/share/man/man1/idlj-8.1 + /usr/share/man/man1/jar-8.1 + /usr/share/man/man1/jarsigner-8.1 + /usr/share/man/man1/java-8.1 + /usr/share/man/man1/javac-8.1 + /usr/share/man/man1/javadoc-8.1 + /usr/share/man/man1/javah-8.1 + /usr/share/man/man1/javap-8.1 + /usr/share/man/man1/jcmd-8.1 + /usr/share/man/man1/jconsole-8.1 + /usr/share/man/man1/jdb-8.1 + /usr/share/man/man1/jdeps-8.1 + /usr/share/man/man1/jhat-8.1 + /usr/share/man/man1/jinfo-8.1 + /usr/share/man/man1/jjs-8.1 + /usr/share/man/man1/jmap-8.1 + /usr/share/man/man1/jps-8.1 + /usr/share/man/man1/jrunscript-8.1 + /usr/share/man/man1/jsadebugd-8.1 + /usr/share/man/man1/jstack-8.1 + /usr/share/man/man1/jstat-8.1 + /usr/share/man/man1/jstatd-8.1 + /usr/share/man/man1/keytool-8.1 + /usr/share/man/man1/native2ascii-8.1 + /usr/share/man/man1/orbd-8.1 + /usr/share/man/man1/pack200-8.1 + /usr/share/man/man1/policytool-8.1 + /usr/share/man/man1/rmic-8.1 + /usr/share/man/man1/rmid-8.1 + /usr/share/man/man1/rmiregistry-8.1 + /usr/share/man/man1/schemagen-8.1 + /usr/share/man/man1/serialver-8.1 + /usr/share/man/man1/servertool-8.1 + /usr/share/man/man1/tnameserv-8.1 + /usr/share/man/man1/unpack200-8.1 + /usr/share/man/man1/wsgen-8.1 + /usr/share/man/man1/wsimport-8.1 + /usr/share/man/man1/xjc-8.1 @@ -817,7 +725,7 @@ programming.devel - openjdk-8 + openjdk-8 /usr/include/openjdk-8/classfile_constants.h @@ -831,12 +739,12 @@ - - 2019-11-10 + + 2019-11-22 8.232 Packaging update - Campbell Jones - me@serebit.com + Fabio Forni + livingsilver94.solus@redaril.me \ No newline at end of file