[blfs-book] r20148 - in trunk/BOOK: . general/prog introduction/welcome

[pierre--- via blfs-book]

Author: pierre
Date: Wed May 16 07:48:14 2018
New Revision: 20148

Log:
Fix building Apache-Maven with Java 10
Remove duplicate fix in NASM

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/maven.xml
   trunk/BOOK/general/prog/nasm.xml
   trunk/BOOK/introduction/welcome/changelog.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Tue May 15 15:59:22 2018        (r20147)
+++ trunk/BOOK/general.ent      Wed May 16 07:48:14 2018        (r20148)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "13">                   <!-- Always 2 digits -->
+<!ENTITY day          "16">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 13th, &year;">
+<!ENTITY releasedate  "May 16th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->

Modified: trunk/BOOK/general/prog/maven.xml
==============================================================================
--- trunk/BOOK/general/prog/maven.xml   Tue May 15 15:59:22 2018        (r20147)
+++ trunk/BOOK/general/prog/maven.xml   Wed May 16 07:48:14 2018        (r20148)
@@ -109,6 +109,14 @@
     <title>Installation of Apache-Maven</title>
 
     <para>
+      First fix two issues which prevent building with Java 10:
+    </para>
+
+<screen><userinput>sed -e '/-surefire-/a&lt;version&gt;2.21.0&lt;/version&gt;' 
\
+    -e '/&lt;commonsLang/s/3\.5/3.7/'              \
+    -i pom.xml</userinput></screen>
+
+    <para>
       Install <application>Apache-Maven</application> by running the following
       commands:
     </para>

Modified: trunk/BOOK/general/prog/nasm.xml
==============================================================================
--- trunk/BOOK/general/prog/nasm.xml    Tue May 15 15:59:22 2018        (r20147)
+++ trunk/BOOK/general/prog/nasm.xml    Wed May 16 07:48:14 2018        (r20148)
@@ -73,10 +73,6 @@
   <sect2 role="installation">
     <title>Installation of NASM</title>
 
-    <para>First, fix an issue when building with gcc 8:</para>
-
-<screen><userinput>sed -i '/seg_init/s/pure_func//' 
include/nasmlib.h</userinput></screen>
-
     <para>If you downloaded the optional documentation, put it into the
     source tree:</para>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Tue May 15 15:59:22 
2018        (r20147)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Wed May 16 07:48:14 
2018        (r20148)
@@ -42,6 +42,16 @@
     </listitem>
 -->
    <listitem>
+      <para>May 16th, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Fix building Apache-Maven with Java 10. Fixes
+          <ulink url="&blfs-ticket-root;10771">#10771</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>May 13th, 2018</para>
       <itemizedlist>
         <listitem>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page