Changeset d2cb534 for general/prog


Ignore:
Timestamp:
08/26/2018 02:41:04 AM (6 years ago)
Author:
DJ Lucas <dj@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
0080c54
Parents:
07499ecc
Message:

Update to OpenJDK-10.0.2. Fixes #10959.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20398 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
general/prog
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • general/prog/java.xml

    r07499ecc rd2cb534  
    77  <!ENTITY anduin-download             "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
    88  <!ENTITY openjdk-download-binary-x86 "&anduin-download;/OpenJDK-&openjdk-version;+&openjdk-build;-i686-bin.tar.xz">
    9   <!ENTITY openjdk-bin-md5sum-x86      "6b594556446845512eadf521a13ff2e2">
    10   <!ENTITY openjdk-bin-size-x86        "155 MB">
    11   <!ENTITY openjdk-bin-buildsize-x86   "299 MB">
     9  <!ENTITY openjdk-bin-md5sum-x86      "d66af9a4303ce9d0c93c92945048e361">
     10  <!ENTITY openjdk-bin-size-x86        "224 MB">
     11  <!ENTITY openjdk-bin-buildsize-x86   "623 MB">
    1212
    1313
    1414  <!ENTITY openjdk-download-binary-x64 "&anduin-download;/OpenJDK-&openjdk-version;+&openjdk-build;-x86_64-bin.tar.xz">
    15   <!ENTITY openjdk-bin-md5sum-x64      "e1357036efe946c23d6ca06d85313634">
    16   <!ENTITY openjdk-bin-size-x64        "168 MB">
    17   <!ENTITY openjdk-bin-buildsize-x64   "328 MB">
     15  <!ENTITY openjdk-bin-md5sum-x64      "a550f9e2aa1e8437346bb52a7b36052e">
     16  <!ENTITY openjdk-bin-size-x64        "252 MB">
     17  <!ENTITY openjdk-bin-buildsize-x64   "771 MB">
    1818]>
    1919
    … …  
    8383    version.</para>
    8484
    85     &lfs82_checked;
     85    &lfs83_checked;
    8686
    8787    <bridgehead renderas="sect3">Binary Package Information</bridgehead>

  • general/prog/openjdk.xml

    r07499ecc rd2cb534  
    1111  <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
    1212
    13   <!ENTITY ojdk-md5sum               "9cc63586cf761644d95b044954a4920f">
     13  <!ENTITY ojdk-md5sum               "d216524203251f1378e660e6fda0b2ec">
    1414  <!ENTITY ojdk-size                 "84 MB">
    15 <!-- There is only one source now
    16   <!ENTITY corba-md5sum              "dbc62e27a93686a9aea12e9c97c2f765">
    17   <!ENTITY hotspot-md5sum            "25853ba33123397b2e755249f102ae73">
    18   <!ENTITY jaxp-md5sum               "f5ab5e468565e1ab3a181d2efb45b51f">
    19   <!ENTITY jaxws-md5sum              "520ff49cb470fbcec2f46cbb3fdb377d">
    20   <!ENTITY jdk-md5sum                "be9f261b19451ab1300c5842188e3fe2">
    21   <!ENTITY langtools-md5sum          "22b65322d04c8ffafd77230dbe5f178f">
    22   <!ENTITY nashorn-md5sum            "729d03b0cede2f697ad77170a9d89095">
    23   <!ENTITY total-download-size       "83 MB">
    24 -->
    25   <!ENTITY jtreg-version             "4.2-b12-366">
     15
     16  <!ENTITY jtreg-version             "4.2-b13-433">
    2617  <!ENTITY jtreg-download            "&anduin-download;/jtreg-&jtreg-version;.tar.gz">
    27   <!ENTITY jtreg-md5sum              "106c049e00ab9e6e48150b370ecf1a88">
     18  <!ENTITY jtreg-md5sum              "a2f25470e005cb7135f61f3bd9c4962e">
    2819  <!ENTITY jtreg-size                "6.8 MB">
    2920
    30   <!ENTITY ojdk-bdsize           "5.4 GB (additional 758 MB for tests)">
    31   <!ENTITY ojdk-time                "5.7 SBU with 4 jobs (additonal 22 SBU for tests with 4 jobs)">
     21  <!ENTITY ojdk-bdsize               "5.8 GB (an additional 346 MB for tests)">
     22  <!ENTITY ojdk-time                 "3.9 SBU with 4 jobs (an additonal 4.7 SBU for tests with 4 jobs)">
    3223]>
    3324
    … …  
    5748    </para>
    5849
    59     &lfs82_checked;
     50    &lfs83_checked;
    6051
    6152    <note>
    … …  
    137128        </para>
    138129      </listitem>
    139 <!--
    140       <listitem>
    141         <para>
    142           In addition to the root package, the instructions below first
    143           download seven subproject tarballs, whose total size is
    144           &total-download-size;.
    145         </para>
    146       </listitem>
    147 -->
    148130      <listitem>
    149131        <para>Estimated disk space required: &ojdk-bdsize;</para>
    … …  
    218200    <title>Installation of OpenJDK</title>
    219201
    220 <!--
    221     <para>
    222       Unlike other packages in BLFS, the <application>OpenJDK</application>
    223       source packages are distributed in multiple tarballs. You need to first
    224       extract the source root from <filename>&ojdk-tarball;</filename>, change
    225       into the extracted directory, then proceed with the following
    226       instructions:
    227     </para>
    228 
    229 <screen><userinput>cat &gt; subprojects.md5 &lt;&lt; EOF &amp;&amp;
    230 &corba-md5sum;  corba.tar.bz2
    231 &hotspot-md5sum;  hotspot.tar.bz2
    232 &jaxp-md5sum;  jaxp.tar.bz2
    233 &jaxws-md5sum;  jaxws.tar.bz2
    234 &jdk-md5sum;  jdk.tar.bz2
    235 &langtools-md5sum;  langtools.tar.bz2
    236 &nashorn-md5sum;  nashorn.tar.bz2
    237 EOF
    238 
    239 for subproject in corba hotspot jaxp jaxws jdk langtools nashorn; do
    240 
    241   wget -c &ojdk-repo;/${subproject}/archive/&ojdk-tarball; \
    242        -O ${subproject}.tar.bz2
    243 done &amp;&amp;
    244 
    245 md5sum -c subprojects.md5 &amp;&amp;
    246 
    247 for subproject in corba hotspot jaxp jaxws jdk langtools nashorn; do
    248   mkdir -pv ${subproject} &amp;&amp;
    249   tar -xf ${subproject}.tar.bz2 -\-strip-components=1 -C ${subproject}
    250 done</userinput></screen>
    251 -->
    252202    <para>
    253203      If you have downloaded the optional test harness, unpack it now:
    … …  
    294244make images</userinput></screen>
    295245
    296     <note>
    297       <para>
    298         By default, the build system will use (NUMCPU - 1) jobs. To
    299         override, set <envar>JOBS=&lt;X&gt;</envar> on make invocation.
    300       </para>
    301     </note>
    302 
    303     <para>
    304       To test the results, issue: <command>make run-test-tier1</command>.
    305       You can limit the number of concurrent tests by setting
    306       <envar>JTREG="JOBS=&lt;X&gt;"</envar> where &lt;X&gt; is the number of
    307       jobs. There is one failure.
    308     </para>
     246    <para>
     247      To test the results, you will need to execute the jtreg program.
     248      You can set the number of concurrent tests by adding the
     249      <parameter>-conc:<replaceable>&lt;X&gt;</replaceable></parameter>
     250      value in the below command (tests will run sequentially otherwise):
     251    </para>
     252
     253<screen><userinput>export JT_JAVA=$(echo $PWD/build/*/jdk) &amp;&amp;
     254jtreg/bin/jtreg -jdk:$JT_JAVA -automatic -ignore:quiet -v1 \
     255    test/jdk:tier1 test/langtools:tier1</userinput></screen>
     256
     257    <para>For more control over the test suite, review the documentation
     258    available in <filename>jtreg/doc/jtreg/usage.txt</filename>. To review the
     259    results, see the files
     260    <filename>JTreport/test_{jdk,langtools}/text/stats.txt</filename> and
     261    <filename>JTreport/test_{jdk,langtools}/text/summary.txt</filename>.
     262    You should expect to see 21 failures and 2 errors in the jdk
     263    test suite, and 7 failures in langtools.</para>
    309264
    310265    <para>Install the package with the following commands as the
    … …  
    314269cp -Rv build/*/images/jdk/* /opt/jdk-&openjdk-version;+&openjdk-build; &amp;&amp;
    315270chown -R root:root /opt/jdk-&openjdk-version;+&openjdk-build;          &amp;&amp;
    316 find /opt/jdk-&openjdk-version;+&openjdk-build; -name \*.diz -delete   &amp;&amp;
    317271for s in 16 24 32 48; do
    318   install -Dm 644 jdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
     272  install -vDm644 src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
    319273                  /usr/share/icons/hicolor/${s}x${s}/apps/java.png
    320 done
     274done &amp;&amp;
     275unset JT_JAVA
    321276</userinput></screen>
    322277
    … …  
    360315NoDisplay=true</literal>
    361316EOF
    362 <!-- No policytool in java 10...
    363 cat &gt; /usr/share/applications/openjdk-policytool.desktop &lt;&lt; "EOF" &amp;&amp;
    364 <literal>[Desktop Entry]
    365 Name=OpenJDK Java &openjdk-version; Policy Tool
    366 Name[pt_BR]=OpenJDK Java &openjdk-version; - Ferramenta de Pol&#237;tica
    367 Comment=OpenJDK Java &openjdk-version; Policy Tool
    368 Comment[pt_BR]=OpenJDK Java &openjdk-version; - Ferramenta de Pol&#237;tica
    369 Exec=/opt/jdk/bin/policytool
    370 Terminal=false
    371 Type=Application
    372 Icon=java
    373 Categories=Settings;</literal>
    374 EOF
    375 -->
    376317cat &gt; /usr/share/applications/openjdk-jconsole.desktop &lt;&lt; "EOF"
    377318<literal>[Desktop Entry]
    … …  
    385326Categories=Application;System;</literal>
    386327EOF</userinput></screen>
    387 <!-- Name[pt_BR] not do=isplayed anymore
    388     <para>
    389       The choice of pt_BR is just an example. You can add any translation
    390       by adding lines corresponding to your locale, e.g. for fr_FR,
    391       <quote>Name[fr_FR]=</quote> and <quote>Comment[fr_FR]=</quote> with the
    392       appropriate text as values.
    393     </para>
    394 -->
     328
    395329  </sect2>
    396330
    … …  
    422356      build system to link to <filename>libstdc++.so</filename> (dynamic)
    423357      instead of <filename>libstdc++.a</filename> (static).
     358    </para>
     359
     360    <para>
     361      <parameter>--with-jobs=<replaceable>&lt;X&gt;</replaceable></parameter>:
     362      The <parameter>-j</parameter> passed to make does not work with make as
     363      invoked here. By default, the build system will use the number of
     364      CPUs - 1.
    424365    </para>
    425366
Note: See TracChangeset for help on using the changeset viewer.