Author: pierre Date: Sat Apr 29 13:22:32 2017 New Revision: 18657 Log: OpenJDK-1.8.0.131 FOP-2.2
Modified: trunk/BOOK/general/prog/java.xml trunk/BOOK/general/prog/openjdk.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/packages.ent trunk/BOOK/pst/ps/fop.xml Modified: trunk/BOOK/general/prog/java.xml ============================================================================== --- trunk/BOOK/general/prog/java.xml Sat Apr 29 12:52:38 2017 (r18656) +++ trunk/BOOK/general/prog/java.xml Sat Apr 29 13:22:32 2017 (r18657) @@ -6,13 +6,13 @@ <!ENTITY anduin-download "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;"> <!ENTITY openjdk-download-binary-x86 "&anduin-download;/OpenJDK-&openjdk-version;-i686-bin.tar.xz"> - <!ENTITY openjdk-bin-md5sum-x86 "69a1c15a7381fd8de4a7d019971c078e"> + <!ENTITY openjdk-bin-md5sum-x86 "e3e114790aca548785be9f9c9657dcff"> <!ENTITY openjdk-bin-size-x86 "57 MB"> - <!ENTITY openjdk-bin-buildsize-x86 "166 MB"> + <!ENTITY openjdk-bin-buildsize-x86 "167 MB"> <!ENTITY openjdk-download-binary-x64 "&anduin-download;/OpenJDK-&openjdk-version;-x86_64-bin.tar.xz"> - <!ENTITY openjdk-bin-md5sum-x64 "1aec751c6f406cbf1f48fc98ab7ead1c"> + <!ENTITY openjdk-bin-md5sum-x64 "645098b95f596fd733db8590405edb2a"> <!ENTITY openjdk-bin-size-x64 "58 MB"> <!ENTITY openjdk-bin-buildsize-x64 "170 MB"> ]> Modified: trunk/BOOK/general/prog/openjdk.xml ============================================================================== --- trunk/BOOK/general/prog/openjdk.xml Sat Apr 29 12:52:38 2017 (r18656) +++ trunk/BOOK/general/prog/openjdk.xml Sat Apr 29 13:22:32 2017 (r18657) @@ -4,39 +4,38 @@ <!ENTITY % general-entities SYSTEM "../../general.ent"> %general-entities; - <!ENTITY ojdk-upd "121"> - <!ENTITY ojdk-bd "b13"> + <!ENTITY ojdk-upd "131"> + <!ENTITY ojdk-bd "b11"> <!ENTITY ojdk-tarball "jdk8u&ojdk-upd;-&ojdk-bd;.tar.bz2"> <!ENTITY ojdk-repo "http://hg.openjdk.java.net/jdk8u/jdk8u";> <!ENTITY ojdk-download "&ojdk-repo;/archive/&ojdk-tarball;"> <!ENTITY anduin-download "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;"> - <!ENTITY ojdk-md5sum "5f3def798fa3a0b2c60ae891856dc9c5"> + <!ENTITY ojdk-md5sum "10f8bc31c15a976dabef42b78222041a"> <!ENTITY ojdk-size "401 KB"> - <!ENTITY corba-md5sum "9c052259b93646687fdcfb71643b69b4"> - <!ENTITY hotspot-md5sum "0ca6e85dcbd96dfa24ac1bdd833aab2e"> - <!ENTITY jaxp-md5sum "c2b5c1947c4aef684b27a463e4149d06"> - <!ENTITY jaxws-md5sum "5a83842eca3881c7bf6abeaccac8f05d"> - <!ENTITY jdk-md5sum "0325b88a2b39d7d72ef0726e91ea4a1d"> - <!ENTITY langtools-md5sum "4dbe002af94423cbe382dda03e3e6a9d"> - <!ENTITY nashorn-md5sum "c87f96bc7ba9596fb5587e307a8f1ec6"> + <!ENTITY corba-md5sum "56ef949b915e684feb9ff22eb6843d4f"> + <!ENTITY hotspot-md5sum "73c46cf954de8c7636f2fc32ed818cc0"> + <!ENTITY jaxp-md5sum "536dd3733705f6588add4eaa40cd9a48"> + <!ENTITY jaxws-md5sum "7c5f85ee99f0e300344a07a5f39bb1fe"> + <!ENTITY jdk-md5sum "9ead63f267880850c7747d49b0b84797"> + <!ENTITY langtools-md5sum "1c6ef3557e00f744bb4c99a10365c3c3"> + <!ENTITY nashorn-md5sum "0206d4536358723ec0a941471a176db4"> <!ENTITY total-download-size "63 MB"> - <!ENTITY jtreg-version "4.2-b05-747"> + <!ENTITY jtreg-version "4.2-b07-816"> <!ENTITY jtreg-download "&anduin-download;/jtreg-&jtreg-version;.tar.gz"> - <!ENTITY jtreg-md5sum "560d275d055112487ea879c44a985b30"> - <!ENTITY jtreg-size "7.2 MB"> + <!ENTITY jtreg-md5sum "e4d2b65faf86bd0d108d42aae1d1c124"> + <!ENTITY jtreg-size "6.9 MB"> <!ENTITY icedtea-web-download "http://icedtea.classpath.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz";> - <!ENTITY ojdk-buildsize "3.5 GB (additional 420 MB for tests)"> - <!ENTITY ojdk-time "5 SBU with 4 jobs in parallel (up to 120 SBU for tests, see below)"> + <!ENTITY ojdk-buildsize "3.1 GB (additional 495 MB for tests)"> + <!ENTITY ojdk-time "5.2 SBU with 4 jobs in parallel (up to 120 SBU for tests, see below)"> ]> -<sect1 id="openjdk" - xreflabel="OpenJDK-&openjdk-version;"> +<sect1 id="openjdk" xreflabel="OpenJDK-&openjdk-version;"> <?dbhtml filename="openjdk.html" ?> <sect1info> @@ -133,8 +132,8 @@ <listitem> <para> In addition to the root package, the instructions below first - download seven subproject tarballs, - whose total size is &total-download-size;. + download seven subproject tarballs, whose total size is + &total-download-size;. </para> </listitem> <listitem> @@ -205,7 +204,7 @@ <para> Unlike other packages in BLFS, the <application>OpenJDK</application> - source packages are distributed in multiple tar balls. You need to first + source packages are distributed in multiple tarballs. You need to first extract the source root from <filename>&ojdk-tarball;</filename>, change into the extracted directory, then proceed with the following instructions: @@ -246,7 +245,7 @@ <para> Before proceeding, you should ensure that your environment <envar>PATH</envar> variable contains the location of the Java - compilers used for bootstrapping <application>OpenJDK</application>. + compiler used for bootstrapping <application>OpenJDK</application>. This is the only requirement for the environment. Modern Java installations do not need <envar>JAVA_HOME</envar> and <envar>CLASSPATH</envar> is not used here. Furthermore, OpenJDK @@ -266,7 +265,7 @@ <screen><userinput>unset JAVA_HOME && sh ./configure \ - --with-update-version=&ojdk-upd; \ + --with-update-version=&ojdk-upd; \ --with-build-number=&ojdk-bd; \ --with-milestone=BLFS \ --enable-unlimited-crypto \ @@ -345,16 +344,16 @@ The tests are run as follows: </para> -<!-- no && here either, because the first "make" may return an error --> -<screen role='nodump'><userinput>LANG=C make -k -C test \ - JT_HOME=${JT_HOME} \ - JT_JAVA=${JT_JAVA} \ - PRODUCT_HOME=${PRODUCT_HOME} all +<screen role='nodump'><userinput> +LANG=C make -k -C test \ + JT_HOME=${JT_HOME} \ + JT_JAVA=${JT_JAVA} \ + PRODUCT_HOME=${PRODUCT_HOME} all || true LANG=C ${JT_HOME}/bin/jtreg -a -v:fail,error \ -dir:$(pwd)/hotspot/test \ -k:\!ignore \ -jdk:${PRODUCT_HOME} \ - :jdk</userinput></screen> + :jdk || true</userinput></screen> <para> Tests duration depends on various factors such as the network speed @@ -366,11 +365,13 @@ <para> The test results can be compared to <ulink url="http://download.java.net/openjdk/testresults/8/";>these - results</ulink>, although they usually are run on a newer version. Some - failures can be expected, the number of which depends on various - conditions, like whether the computer is connected to network. Also, some - tests may timeout if the machine is under load. Those are the reasons for - considering the tests optional, although we would rather recommend them. + results</ulink>, although they usually are run on a newer version. About + 30 tests are known to fail, but the exact number depends on various + conditions, like whether the computer is connected to network, or to a + printer, and on the options given to configure + (<parameter>--enable-unlimited-crypto</parameter> is known to trigger + failures, but those come from the code in the tests, not from the + installation). Also, some tests may timeout if the machine is under load. </para> <para> @@ -404,15 +405,19 @@ <screen role="root"><userinput>ln -v -nsf OpenJDK-&openjdk-version; /opt/jdk</userinput></screen> - <para>If desired, you may install a .desktop file corresponding to an entry - in a desktop menu for <command>policytool</command>. First, you need to - obtain an icon from <xref linkend="icedtea-web"/>:</para> + <para> + If desired, you may install a .desktop file corresponding to an entry + in a desktop menu for <command>policytool</command>. First, you need to + obtain an icon from <xref linkend="icedtea-web"/>: + </para> <screen><userinput>tar -xf ../icedtea-web-&icedtea-web-version;.tar.gz \ icedtea-web-&icedtea-web-version;/javaws.png \ --strip-components=1</userinput></screen> - <para>Now, as <systemitem class="username">root</systemitem> user:</para> + <para> + Now, as <systemitem class="username">root</systemitem> user: + </para> <screen role="root"><userinput>mkdir -pv /usr/share/applications && @@ -431,10 +436,12 @@ install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png</userinput></screen> - <para>The choice of pt_BR is just an example. You can add any translation - by adding lines corresponding to your locale, e.g. for fr_FR, - <quote>Name[fr_FR]=</quote> and <quote>Comment[fr_FR]=</quote> with the - appropriate text as values.</para> + <para> + The choice of pt_BR is just an example. You can add any translation + by adding lines corresponding to your locale, e.g. for fr_FR, + <quote>Name[fr_FR]=</quote> and <quote>Comment[fr_FR]=</quote> with the + appropriate text as values. + </para> </sect2> @@ -502,10 +509,10 @@ <para> <option>--with-cacerts-file=...</option>: Specifies where to find a - <filename>cacerts</filename> file, typically <filename> - /opt/jdk/jre/lib/security</filename>. Otherwise, an empty one is created. - You can get it from an earlier version of the package, or use the - script below to generate one. + <filename>cacerts</filename> file, <filename class="directory"> + /etc/ssl/java/cacerts</filename> on a BLFS system. Otherwise, an empty + one is created. You can use the <command>make-ca.sh --force</command> + command to generate it, once you have installed the Java binaries. </para> <para> @@ -562,16 +569,20 @@ <screen role="root"><userinput>ln -sfv /etc/ssl/java/cacerts /opt/jdk/jre/lib/security/cacerts</userinput></screen> - <para>Use the following commands to check if the - <filename>cacerts</filename> file has been successfully installed:</para> + <para> + Use the following commands to check if the <filename>cacerts</filename> + file has been successfully installed: + </para> <screen role="root"><userinput>cd /opt/jdk bin/keytool -list -keystore /etc/ssl/java/cacerts</userinput></screen> - <para>At the prompt "Enter keystore password:", enter "changeit" (the - default). If the <filename>cacerts</filename> file was installed - correctly, you will see a list of the certificates with related - information for each one. If not, you need to reinstall them.</para> + <para> + At the prompt "Enter keystore password:", enter "changeit" (the + default). If the <filename>cacerts</filename> file was installed + correctly, you will see a list of the certificates with related + information for each one. If not, you need to reinstall them. + </para> </sect3> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Sat Apr 29 12:52:38 2017 (r18656) +++ trunk/BOOK/introduction/welcome/changelog.xml Sat Apr 29 13:22:32 2017 (r18657) @@ -45,6 +45,15 @@ <para>April 29th, 2017</para> <itemizedlist> <listitem> + <para>[pierre] - Update to FOP-2.2, reinstate OFFO hyphenation + patterns and fix tests running. Fixes + <ulink url="&blfs-ticket-root;9117">#9117</ulink>.</para> + </listitem> + <listitem> + <para>[pierre] - Update to OpenJDK-1.8.0.131. Fixes + <ulink url="&blfs-ticket-root;9144">#9144</ulink>.</para> + </listitem> + <listitem> <para>[bdubbs] - Update to unbound-1.6.1. Fixes <ulink url="&blfs-ticket-root;8910">#8910</ulink>.</para> </listitem> Modified: trunk/BOOK/packages.ent ============================================================================== --- trunk/BOOK/packages.ent Sat Apr 29 12:52:38 2017 (r18656) +++ trunk/BOOK/packages.ent Sat Apr 29 13:22:32 2017 (r18657) @@ -330,7 +330,7 @@ <!ENTITY apache-ant-version "1.10.1"> <!ENTITY junit-version "4.11"> <!ENTITY hamcrest-version "1.3"> -<!ENTITY openjdk-version "1.8.0.121"> +<!ENTITY openjdk-version "1.8.0.131"> <!ENTITY python2-majorver "2.7"> <!ENTITY python3-majorver "3.6"> @@ -865,7 +865,7 @@ <!ENTITY enscript-version "1.6.6"> <!ENTITY psutils-version "p17"> <!ENTITY epdfview-version "0.1.8"> -<!ENTITY fop-version "2.1"> +<!ENTITY fop-version "2.2"> <!ENTITY mupdf-version "1.11"> <!ENTITY paps-version "0.6.8"> Modified: trunk/BOOK/pst/ps/fop.xml ============================================================================== --- trunk/BOOK/pst/ps/fop.xml Sat Apr 29 12:52:38 2017 (r18656) +++ trunk/BOOK/pst/ps/fop.xml Sat Apr 29 13:22:32 2017 (r18657) @@ -6,10 +6,10 @@ <!ENTITY fop-download-http "https://archive.apache.org/dist/xmlgraphics/fop/source/fop-&fop-version;-src.tar.gz";> <!ENTITY fop-download-ftp " "> - <!ENTITY fop-md5sum "13b5b497dfb0ba8a01093dfc1a89d106"> - <!ENTITY fop-size "23 MB"> - <!ENTITY fop-buildsize "342 MB"> - <!ENTITY fop-time "0.3 SBU"> + <!ENTITY fop-md5sum "6d2388bd8851b4883d3258c0afc96895"> + <!ENTITY fop-size "24 MB"> + <!ENTITY fop-buildsize "493 MB (add 39 MB for tests)"> + <!ENTITY fop-time "0.7 SBU (add 0.7 SBU for tests)"> <!ENTITY jai-version "1_1_3"> <!ENTITY jai-download "http://download.java.net/media/jai/builds/release/&jai-version;/jai-&jai-version;-lib-linux-i586.tar.gz";> @@ -19,11 +19,9 @@ <!ENTITY jai64-download "http://download.java.net/media/jai/builds/release/&jai-version;/jai-&jai-version;-lib-linux-amd64.tar.gz";> <!ENTITY jai64-md5sum "4a906db35612f668aeef2c0606d7075b"> <!ENTITY jai64-size "3.4 MB"> -<!-- - <!ENTITY offo-download "&sourceforge-repo;/offo/offo-hyphenation_v2.0.zip"> - <!ENTITY offo-md5sum "a78171d47c9af223c51bbd42df36f26d"> - <!ENTITY offo-size "858 KB"> ---> + <!ENTITY offo-download "&sourceforge-repo;/projects/offo/files/offo-hyphenation/2.2/offo-hyphenation.zip"> + <!ENTITY offo-md5sum "bf9c09bf05108ef9661b8f08d91c2336"> + <!ENTITY offo-size "862 KB"> ]> <sect1 id="fop" xreflabel="fop-&fop-version;"> @@ -81,7 +79,6 @@ <itemizedlist spacing="compact"> <title>Recommended packages</title> -<!-- <listitem> <para>Objects for Formatting Objects (OFFO) hyphenation patterns: <simplelist> @@ -91,7 +88,7 @@ </simplelist> </para> </listitem> ---> + <listitem> <para>Java Advanced Imaging (JAI) API components (architecture dependent): <simplelist> @@ -108,14 +105,14 @@ </para> </listitem> </itemizedlist> - <itemizedlist spacing="compact"> +<!-- <itemizedlist spacing="compact"> <title>Required patch</title> <listitem> <para> <ulink url="&patch-root;/fop-&fop-version;-listNPE-1.patch"/> </para> </listitem> - </itemizedlist> + </itemizedlist>--> <bridgehead renderas="sect3">fop Dependencies</bridgehead> @@ -128,14 +125,13 @@ <para role="optional"> <xref linkend="junit"/> (to run tests), <xref linkend="x-window-system"/> (to run tests), - <ulink url="http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-java-client-419417.html";>JIMI SDK</ulink>, - <ulink url="http://www.xmlunit.org/";>XMLUnit</ulink>, - <ulink url="https://java.net/projects/jai-imageio";>JAI Image I/O Tools</ulink>, - <ulink url="http://jeuclid.sourceforge.net/";>JEuclid</ulink>, - <ulink url="https://pmd.github.io/";>PMD</ulink> - (requires <ulink url="http://jaxen.org/";>Jaxen</ulink>), and - <ulink url="http://forrest.apache.org/";>Forrest</ulink> (Forrest used only - to build the documentation) + <ulink url="https://maven.apache.org/";>Maven</ulink>, + <ulink url="https://java.net/projects/jai-imageio";>JAI Image I/O Tools</ulink>, and + <ulink url="http://jeuclid.sourceforge.net/";>JEuclid</ulink> +<!-- [pierre 2017-04-29] Note to devs: there are a lot of bundled dependencies. + Some were listed here, but not all. I am not sure it is possible to + use system ones. So, I have removed them, an kept only those which + are not bundled. --> </para> <para condition="html" role="usernotes">User Notes: @@ -153,23 +149,21 @@ corresponding <filename class='extension'>.jar</filename> files can be found via the <envar>CLASSPATH</envar> environment variable. </para> -<!-- + <sect3> <title>Installing OFFO Hyphenation Patterns</title> <para> - First, unpack the <application>fop</application> source tarball and - the hyphenation zipfile from the same directory, then change directories - into the root of the <application>fop</application> source tree. Copy - the XML hyphenation patterns into the <application>fop</application> - source tree by running the following commands: + Copy the XML hyphenation patterns into the fop source tree by running + the following commands: </para> -<screen><userinput>cp ../offo-hyphenation/hyph/* hyph && -rm -rf ../offo-hyphenation</userinput></screen> +<screen><userinput>unzip ../offo-hyphenation.zip && +cp offo-hyphenation/hyph/* fop/hyph && +rm -rf offo-hyphenation</userinput></screen> </sect3> ---> + <sect3> <title>Installing Java Advanced Imaging (JAI) API components</title> @@ -206,34 +200,43 @@ <screen><userinput>sed -i '\@</javad@i\ <arg value="-Xdoclint:none"/>\ -<arg value="--allow-script-in-comments"/>' build.xml</userinput></screen> +<arg value="--allow-script-in-comments"/>' fop/build.xml</userinput></screen> + + <para> + The stack size set in <filename>build.xml</filename> for building the + hyphenation patterns is not enough. Change it by running: + </para> +<screen><userinput>sed -e '/hyph\.stack/s/512k/1M/' \ + -i fop/build.xml</userinput></screen> <para> Then, compile <application>fop</application> by running the following commands: </para> -<screen><userinput>patch -Np1 -i ../fop-&fop-version;-listNPE-1.patch && +<screen><userinput>cd fop && +export LC_ALL=en_US.UTF-8 && -ant compile && -ant jar-main && -ant javadocs && +ant compile && +ant jar-main && +ant jar-hyphenation && +ant javadocs && mv build/javadocs .</userinput></screen> -<!-- ant docs target is not present anymore in fop-2.0 <para> - If <application>Forrest</application> is installed, - build the full set of documentation: + To test the application, first modify <filename>build.xml</filename> + so that tests do not stop when an error is encountered: </para> + +<screen><userinput>sed -e '/haltonfailure/s/yes/off/' \ + -i build.xml</userinput></screen> -<screen><userinput>ant docs</userinput></screen> ---> <para> - To test the application, run <command>ant junit-all</command>. The - hyphenation tests will fail. To see a list of other test targets, use - <command>ant -p</command>. You must run the tests from an X-window using - a GL-aware <application>Xorg</application> server or some of the - <application>JUnit</application> tests will hang. + Then, run <command>ant junit</command>. The hyphenation tests will + fail if OFFO hyphenation has not been compiled. To see a list of other + test targets, use <command>ant -p</command>. You must run the tests + from an X-window using a GL-aware <application>Xorg</application> + server or some of the <application>JUnit</application> tests will hang. </para> <para> @@ -241,10 +244,11 @@ </para> <screen role="root"><userinput>install -v -d -m755 -o root -g root /opt/fop-&fop-version; && -cp -v KEYS LICENSE NOTICE README /opt/fop-&fop-version; && +cp -v ../{KEYS,LICENSE,NOTICE,README} /opt/fop-&fop-version; && cp -vR build conf examples fop* javadocs lib /opt/fop-&fop-version; && +chmod a+x /opt/fop-&fop-version;/fop && -ln -v -sf fop-&fop-version; /opt/fop</userinput></screen> +ln -v -sfn fop-&fop-version; /opt/fop</userinput></screen> </sect3> @@ -260,15 +264,16 @@ </para> <para> - <command>patch -Np1 -i ../fop-2.1-listNPE-1.patch</command>: This patch - fixes a bug leading to segmentation faults when processing some inputs. + <command>export LC_ALL=en_US.UTF-8</command>: the compiler fails if using + an ASCII locale. </para> <para> <command>ant <option>target</option></command>: This reads the file <filename>build.xml</filename> and builds the target: <option>compile </option> compiles the java sources, <option>jar-main</option> generates - jar archives, and <option>javadocs</option> builds the documentation. + jar archives, <option>jar-hyphenation</option> generates the hyphenation + patterns for FOP, and <option>javadocs</option> builds the documentation. </para> <para> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
