From 91a82cb5a1fd24f46bca60f6b950c95858c8431e Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Thu, 26 Apr 2018 01:57:52 +0000 Subject: [PATCH] OpenJDK-10.0.1+10 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20116 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general/prog/java.xml | 12 +- general/prog/openjdk.xml | 181 +++++++++++++++++++++-------- introduction/welcome/changelog.xml | 7 +- packages.ent | 4 +- 4 files changed, 145 insertions(+), 59 deletions(-) diff --git a/general/prog/java.xml b/general/prog/java.xml index c7f3cdd441..54d0945485 100644 --- a/general/prog/java.xml +++ b/general/prog/java.xml @@ -6,15 +6,15 @@ - - - + + + - - - + + + ]> diff --git a/general/prog/openjdk.xml b/general/prog/openjdk.xml index f6d1b9195a..5c6ab22083 100644 --- a/general/prog/openjdk.xml +++ b/general/prog/openjdk.xml @@ -5,14 +5,14 @@ %general-entities; - + - - - + + + + - - + + - - + + ]> @@ -136,6 +136,7 @@ Download Size: &ojdk-size; + Estimated disk space required: &ojdk-bdsize; @@ -201,8 +203,10 @@ Optional - and - an X Window manager such as (for the tests) + , + , + an X Window manager such as (for the tests), and + pandoc User Notes: @@ -213,6 +217,7 @@ Installation of OpenJDK + - If you have downloaded the optional test harness, unpack it too: + If you have downloaded the optional test harness, unpack it now: tar -xf ../jtreg-&jtreg-version;.tar.gz @@ -282,7 +287,7 @@ bash configure --enable-unlimited-crypto \ --with-libjpeg=system \ --with-libpng=system \ --with-zlib=system \ - --with-version-build="11" \ + --with-version-build="&openjdk-build;" \ --with-version-pre="" \ --with-version-opt="" \ --with-cacerts-file=/etc/ssl/java/cacerts.jks && @@ -296,11 +301,10 @@ make images - To test the results, issue: make run-test-tier1. Seven - tests are expected to fail, and 11 to error when building only the server - target. You can limit the number of concurrent tests by setting + To test the results, issue: make run-test-tier1. + You can limit the number of concurrent tests by setting JTREG="JOBS=<X>" where <X> is the number of - jobs. + jobs. There is one failure. Install the package with the following commands as the @@ -312,7 +316,7 @@ chown -R root:root /opt/jdk-&openjdk-version;+&openjdk-build; && find /opt/jdk-&openjdk-version;+&openjdk-build; -name \*.diz -delete && for s in 16 24 32 48; do install -Dm 644 jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \ - /usr/share/icons/hicolor/${s}x${s}/apps/java9.png + /usr/share/icons/hicolor/${s}x${s}/apps/java.png done @@ -346,38 +350,38 @@ done cat > /usr/share/applications/openjdk-9-java.desktop << "EOF" && [Desktop Entry] -Name=OpenJDK Java 9 Runtime -Comment=OpenJDK Java 9 Runtime +Name=OpenJDK Java &openjdk-version; Runtime +Comment=OpenJDK Java &openjdk-version; Runtime Exec=/opt/jdk/bin/java -jar Terminal=false Type=Application -Icon=java9 +Icon=java MimeType=application/x-java-archive;application/java-archive;application/x-jar; NoDisplay=true EOF cat > /usr/share/applications/openjdk-9-policytool.desktop << "EOF" && [Desktop Entry] -Name=OpenJDK Java 9 Policy Tool -Name[pt_BR]=OpenJDK Java 9 - Ferramenta de Política -Comment=OpenJDK Java 9 Policy Tool -Comment[pt_BR]=OpenJDK Java 9 - Ferramenta de Política +Name=OpenJDK Java &openjdk-version; Policy Tool +Name[pt_BR]=OpenJDK Java &openjdk-version; - Ferramenta de Política +Comment=OpenJDK Java &openjdk-version; Policy Tool +Comment[pt_BR]=OpenJDK Java &openjdk-version; - Ferramenta de Política Exec=/opt/jdk/bin/policytool Terminal=false Type=Application -Icon=java9 +Icon=java Categories=Settings; EOF cat > /usr/share/applications/openjdk-9-jconsole.desktop << "EOF" [Desktop Entry] -Name=OpenJDK Java 9 Console -Comment=OpenJDK Java 9 Console +Name=OpenJDK Java &openjdk-version; Console +Comment=OpenJDK Java &openjdk-version; Console Keywords=java;console;monotoring Exec=/opt/jdk/bin/jconsole Terminal=false Type=Application -Icon=java9 +Icon=java Categories=Application;System; EOF @@ -526,16 +530,15 @@ bin/keytool -list -cacerts Installed Directory - appletviewer, extcheck, idlj, jar, - jarsigner, java, javac, javadoc, javah, javap, java-rmi.cgi, - jcmd, jconsole, jdb, jdeps, jhat, jinfo, jjs, jmap, jps, - jrunscript, jsadebugd, jstack, jstat, jstatd, keytool, - native2ascii, orbd, pack200, policytool, rmic, rmid, rmiregistry, + appletviewer, idlj, jaotc, jar, + jarsigner, java, javac, javadoc, javap, jcmd, jconsole, jdb, + jdeprscan, jdeps, jhsdb, jimage, jinfo, jjs, jlink, jmap, jmod, jps, + jrunscript, jshell, jstack, jstat, jstatd, keytool, + orbd, pack200, rmic, rmid, rmiregistry, schemagen, serialver, servertool, tnameserv, unpack200, wsgen, wsimport, and xjc - /opt/OpenJDK-&openjdk-version;/lib/*, and - /opt/OpenJDK-&openjdk-version;/jre/lib/* - /opt/OpenJDK-&openjdk-version; + /opt/jdk-&openjdk-version;/lib/* + /opt/jdk-&openjdk-version; @@ -553,7 +556,7 @@ bin/keytool -list -cacerts - + idlj @@ -576,6 +579,16 @@ bin/keytool -list -cacerts + + jaotc + + is an ahead-of-time java class compiler. + + jaotc + + + + jar @@ -634,6 +647,7 @@ bin/keytool -list -cacerts + javap @@ -654,7 +668,7 @@ bin/keytool -list -cacerts - + jcmd @@ -697,6 +711,17 @@ bin/keytool -list -cacerts + + jdeprscan + + scans class or jar files for uses of deprecated API + elements. + + jdeprscan + + + + jdeps @@ -708,6 +733,17 @@ bin/keytool -list -cacerts + + jhsdb + + is a tool to analyze the content of a core dump from a + crashed Java Virtual Machine (JVM). + + jhsdb + + + + + + jimage + + is used to list, extract, verify, or get information about + modules in jimage format. + + jimage + + + jinfo @@ -742,6 +789,17 @@ bin/keytool -list -cacerts + + jlink + + is used to assemble and optimize a set of modules and their + dependencies into a custom runtime image. + + jlink + + + + jmap @@ -753,6 +811,18 @@ bin/keytool -list -cacerts + + jmod + + creates JMOD files and lists the content of existing JMOD + files. + + jmod + + + + + jps @@ -773,6 +843,17 @@ bin/keytool -list -cacerts + + jshell + + is an interactive tool for learning the Java programming + language and prototyping Java code. + + jshell + + + + jstack @@ -825,7 +906,7 @@ bin/keytool -list -cacerts - + orbd @@ -858,7 +939,7 @@ bin/keytool -list -cacerts - + rmic diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index d463c571f6..df9aef3b6d 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,8 +42,12 @@ --> - April 24th, 2018 + April 25th, 2018 + + [pierre] - Update to openjdk-10.0.1+10. Fixes + #10592. + [ken] - Patch libreoffice-6.0.1.1 to build with poppler-0.64.0. @@ -57,6 +61,7 @@ + April 24th, 2018 diff --git a/packages.ent b/packages.ent index 1dda5d94c6..cbb3badef1 100644 --- a/packages.ent +++ b/packages.ent @@ -349,8 +349,8 @@ to avoid building libxml2 twice, which is slow with all deps --> - - + +