[blfs-book] r10277 - in trunk/BOOK: . general/genlib introduction/welcome

andy at linuxfromscratch.org andy at linuxfromscratch.org
Thu Jun 7 04:38:56 PDT 2012


Author: andy
Date: 2012-06-07 05:38:52 -0600 (Thu, 07 Jun 2012)
New Revision: 10277

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/nspr.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
nspr-4.9.1

Modified: trunk/BOOK/general/genlib/nspr.xml
===================================================================
--- trunk/BOOK/general/genlib/nspr.xml	2012-06-07 11:19:13 UTC (rev 10276)
+++ trunk/BOOK/general/genlib/nspr.xml	2012-06-07 11:38:52 UTC (rev 10277)
@@ -8,7 +8,7 @@
   "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
   <!ENTITY nspr-download-ftp
   "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
-  <!ENTITY nspr-md5sum        "aa0c960b23a9d66a3c30c3e6ba80a99a">
+  <!ENTITY nspr-md5sum        "d36d7b65a38f5b43ebd50ad3ad227120">
   <!ENTITY nspr-size          "1.2 MB">
   <!ENTITY nspr-buildsize     "15 MB">
   <!ENTITY nspr-time          "less than 0.1 SBU">
@@ -85,10 +85,10 @@
     </para>
 
 <screen><userinput>cd mozilla/nsprpub &&
-sed -i 's#^\(RELEASE_BINS =\).*#\1#' pr/src/misc/Makefile.in &&
-sed -i 's#$(LIBRARY) ##' config/rules.mk &&
-./configure --prefix=/usr --with-mozilla --with-pthreads \
-  $([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
+sed -ri 's#^(RELEASE_BINS =).*#\1#' pr/src/misc/Makefile.in &&
+sed -i 's#$(LIBRARY) ##' config/rules.mk                     &&
+./configure --prefix=/usr --with-mozilla --with-pthreads     \
+  $([ $(uname -m) = x86_64 ] && echo --enable-64bit)         &&
 make</userinput></screen>
 
     <para>
@@ -100,7 +100,6 @@
     </para>
 
 <screen role="root"><userinput>make install &&
-
 cat > /usr/lib/pkgconfig/nspr.pc << "HERE_DOC"
 prefix=/usr
 exec_prefix=${prefix}
@@ -130,15 +129,18 @@
     </para>
 
     <para>
-      <parameter>$([ $(uname -m) ... --enable-64bit</parameter>: This parameter is
-      required <emphasis>on an x86_64 system</emphasis> to prevent
+      <parameter>$([ $(uname -m) = x86_64 ] && echo
+      --enable-64bit)</parameter>: The --enable-64bit option is
+      <emphasis>required</emphasis> on an x86_64 system to prevent
       <command>configure</command> failing with a claim that this is a system
-      without pthread support. It has no effect on a 32 bit system.
+      without pthread support. The [ $(uname -m) = x86_64 ] test ensures it has
+      no effect on a 32 bit system.
     </para>
 
     <para>
-      <command>sed -i 's#^\(RELEASE_BINS ...</command>: This disables installing
-      two unneeded scripts.
+      <command>sed -ri 's#^(RELEASE_BINS =).*#\1#'
+      pr/src/misc/Makefile.in</command>: This disables installing two unneeded
+      scripts.
     </para>
 
     <para>
@@ -146,8 +148,10 @@
       installing the static libraries.
     </para>
 
-    <para><command>cat > /usr/lib/pkgconfig/nspr.pc ...</command>Create a 
-     pkg-config file to help other programs finding the nspr libraries.</para>
+    <para>
+      <command>cat > /usr/lib/pkgconfig/nspr.pc ...</command>: This creates a 
+      pkg-config file to help other programs find the nspr libraries.
+    </para>
 
   </sect2>
 

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-06-07 11:19:13 UTC (rev 10276)
+++ trunk/BOOK/general.ent	2012-06-07 11:38:52 UTC (rev 10277)
@@ -224,7 +224,7 @@
 <!ENTITY libxml2-version              "2.8.0">
 <!ENTITY libxslt-version              "1.1.26">
 <!ENTITY LZO-version                  "2.06">
-<!ENTITY nspr-version                 "4.9">
+<!ENTITY nspr-version                 "4.9.1">
 <!ENTITY pcre-version                 "8.30">
 <!ENTITY popt-version                 "1.16">
 <!ENTITY pth-version                  "2.0.7">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-06-07 11:19:13 UTC (rev 10276)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-06-07 11:38:52 UTC (rev 10277)
@@ -53,6 +53,9 @@
         <listitem>
           <para>[abenton] - Updated NSS to 3.13.5.</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - Updated NSPR to 4.9.1.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
     




More information about the blfs-book mailing list