Author: bdubbs
Date: Fri Feb 24 10:42:12 2017
New Revision: 18403

Log:
Remove lfs7a entities
Touch up some instructions and text.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/graphlib/libpng.xml
   trunk/BOOK/networking/netutils/networkmanager.xml
   trunk/BOOK/postlfs/security/openssl.xml
   trunk/BOOK/pst/printing/cups.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Fri Feb 24 09:33:07 2017        (r18402)
+++ trunk/BOOK/general.ent      Fri Feb 24 10:42:12 2017        (r18403)
@@ -88,11 +88,6 @@
 <!ENTITY lfs80_built          "<para>This package is known to build using an 
LFS
                               8.0 platform but has not been tested.</para>">
 
-<!ENTITY lfs7a_checked        "<para>This package is known to build and work
-                              properly using an LFS-7.10 platform.</para>">
-<!ENTITY lfs7a_built          "<para>This package is known to build using an 
LFS
-                              7.10 platform but has not been tested.</para>">
-
 <!ENTITY lfssvn_checked       "This package is known to build and work properly
                                using an LFS-SVN-">
 <!ENTITY lfssvn_checked2      " platform.">

Modified: trunk/BOOK/general/graphlib/libpng.xml
==============================================================================
--- trunk/BOOK/general/graphlib/libpng.xml      Fri Feb 24 09:33:07 2017        
(r18402)
+++ trunk/BOOK/general/graphlib/libpng.xml      Fri Feb 24 10:42:12 2017        
(r18403)
@@ -110,7 +110,7 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>LIBS=-lphtread ./configure --prefix=/usr --disable-static 
&amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -130,6 +130,11 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <envar>LIBS=-lphtread</envar>: Ensure the libpthread library is
+      used to allow parallelism on systems with multiple cores.
+    </para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>
 

Modified: trunk/BOOK/networking/netutils/networkmanager.xml
==============================================================================
--- trunk/BOOK/networking/netutils/networkmanager.xml   Fri Feb 24 09:33:07 
2017        (r18402)
+++ trunk/BOOK/networking/netutils/networkmanager.xml   Fri Feb 24 10:42:12 
2017        (r18403)
@@ -287,7 +287,7 @@
       </para>
 
 <screen role="root"><userinput>groupadd -fg 86 netdev &amp;&amp;
-/sbin/usermod -a -G netdev <replaceable>&lt;username&gt;</replaceable>
+/usr/sbin/usermod -a -G netdev <replaceable>&lt;username&gt;</replaceable>
 
 cat &gt; /usr/share/polkit-1/rules.d/org.freedesktop.NetworkManager.rules 
&lt;&lt; "EOF"
 <literal>polkit.addRule(function(action, subject) {

Modified: trunk/BOOK/postlfs/security/openssl.xml
==============================================================================
--- trunk/BOOK/postlfs/security/openssl.xml     Fri Feb 24 09:33:07 2017        
(r18402)
+++ trunk/BOOK/postlfs/security/openssl.xml     Fri Feb 24 10:42:12 2017        
(r18403)
@@ -100,24 +100,24 @@
   <sect2 role="installation">
     <title>Installation of OpenSSL</title>
 
+    <note>
+      <para>
+        This package does not support parallel build.
+      </para>
+    </note>
+ 
     <para>
       Install <application>OpenSSL</application> with the following commands:
     </para>
 
-<!-- libdir=lib so it doesn't write over /usr/lib64 symlink on 64 bit system.
-     Might break packaging. -->
 
-<!-- Parallel build for version 1.0.2d at -j8 works for me without the patch.
-     But it only reduces build time from 1.0 to 0.7 SBU - Bruce
-
-<screen><userinput>patch -Np1 -i 
../openssl-&openssl-version;-fix_parallel_build-1.patch &amp;&amp;-->
 <screen><userinput>./config --prefix=/usr         \
          --openssldir=/etc/ssl \
          --libdir=lib          \
          shared                \
          zlib-dynamic &amp;&amp;
 make depend           &amp;&amp;
-make</userinput></screen>
+make -j1</userinput></screen>
 
     <para>
       To test the results, issue: <command>make -j1 test</command>.  The

Modified: trunk/BOOK/pst/printing/cups.xml
==============================================================================
--- trunk/BOOK/pst/printing/cups.xml    Fri Feb 24 09:33:07 2017        (r18402)
+++ trunk/BOOK/pst/printing/cups.xml    Fri Feb 24 10:42:12 2017        (r18403)
@@ -222,11 +222,10 @@
     </para>
 
 
-<screen revision="sysv"><userinput>sed -i 's:555:755:g;s:444:644:g' 
Makedefs.in                                  &amp;&amp;
-sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4          
&amp;&amp;
-sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4                        
&amp;&amp;
-<!--sed -i 's@else /\* HAVE_AVAHI \*/@elif defined(HAVE_AVAHI)@' 
test/ippserver.c &amp;&amp;
--->
+<screen revision="sysv"><userinput>sed -i 's:555:755:g;s:444:644:g' 
Makedefs.in                         &amp;&amp;
+sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4 &amp;&amp;
+sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4               &amp;&amp;
+
 aclocal  -I config-scripts &amp;&amp;
 autoconf -I config-scripts &amp;&amp;
 
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to