[blfs-book] r9435 - in trunk/BOOK: general/prog template

andy at linuxfromscratch.org andy at linuxfromscratch.org
Thu Feb 16 10:16:57 PST 2012


Author: andy
Date: 2012-02-16 11:16:53 -0700 (Thu, 16 Feb 2012)
New Revision: 9435

Modified:
   trunk/BOOK/general/prog/spidermonkey.xml
   trunk/BOOK/template/template.xml
Log:
SpiderMonkey tweaks

Modified: trunk/BOOK/general/prog/spidermonkey.xml
===================================================================
--- trunk/BOOK/general/prog/spidermonkey.xml	2012-02-16 16:38:18 UTC (rev 9434)
+++ trunk/BOOK/general/prog/spidermonkey.xml	2012-02-16 18:16:53 UTC (rev 9435)
@@ -4,8 +4,10 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY SpiderMonkey-download-http "https://ftp.mozilla.org/pub/mozilla.org/js/js185-&spidermonkey-version;.tar.gz">
-  <!ENTITY SpiderMonkey-download-ftp  " ">
+  <!ENTITY SpiderMonkey-download-http
+  "http://ftp.mozilla.org/pub/mozilla.org/js/js185-&spidermonkey-version;.tar.gz">
+  <!ENTITY SpiderMonkey-download-ftp
+  "ftp://ftp.mozilla.org/pub/mozilla.org/js/js185-&spidermonkey-version;.tar.gz">
   <!ENTITY SpiderMonkey-md5sum        "a4574365938222adca0a6bd33329cb32">
   <!ENTITY SpiderMonkey-size          "5.9 MB">
   <!ENTITY SpiderMonkey-buildsize     "99 MB">
@@ -38,7 +40,8 @@
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&SpiderMonkey-download-http;"/></para>
+        <para>Download (HTTP):
+        <ulink url="&SpiderMonkey-download-http;"/></para>
       </listitem>
       <listitem>
         <para>Download (FTP): <ulink url="&SpiderMonkey-download-ftp;"/></para>
@@ -57,14 +60,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Recommended Patch: <ulink
-        url="&patch-root;/js185-&spidermonkey-version;-DESTDIR-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">SpiderMonkey Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -74,45 +69,41 @@
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/SpiderMonkey"/></para>
-
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of SpiderMonkey</title>
 
-    <para>Install <application>SpiderMonkey</application> by running the following
-    commands:</para>
+    <para>Install <application>SpiderMonkey</application> by running the
+    following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../js185-&spidermonkey-version;-DESTDIR-1.patch &&
-cd js/src &&
-./configure --prefix=/usr \
-            --enable-threadsafe \
-            --with-system-nspr &&
+<screen><userinput>cd js/src &&
+sed -i 's#s \($(SHLIB_\(ABI\|EXACT\)_VER)\)#s $(notdir \1)#' Makefile.in &&
+./configure --prefix=/usr --enable-threadsafe --with-system-nspr &&
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>patch -Np1 -i ../js185-&spidermonkey-version;-DESTDIR-1.patch</command>:
-    If <application>SpiderMonkey</application> is installed in a DESTDIR, this patch fixes
-    the symlinks for <filename>libmozjs185.so</filename> so that they do not point to the
-    <emphasis>build</emphasis> tree.</para>
+    <para><command>sed -i 's#s \($(SHLIB_\(ABI\|EXACT\)_VER)\)#s $(notdir \1)#'
+    Makefile.in</command>: This sed fixes
+    the symlinks for <filename>libmozjs185.so</filename> so that they are
+    relative and not absolute symlinks.</para>
 
-    <para><parameter>--enable-threadsafe</parameter>: This switch enables support
-    for multiple threads.</para>
+    <para><parameter>--enable-threadsafe</parameter>: This switch enables
+    support for multiple threads.</para>
 
     <para><parameter>--with-system-nspr</parameter>: This parameter forces the
     package to link to the system version of <application>nspr</application>
     instead of using its included, and now old, version.</para>
-
   </sect2>
 
   <sect2 role="content">
@@ -146,7 +137,7 @@
       </varlistentry>
 
       <varlistentry id="libmozjs185-1">
-        <term><filename class='libraryfile'>libmozjs185-1.0.a</filename></term>
+        <term><filename class="libraryfile">libmozjs185-1.0.a</filename></term>
         <listitem>
           <para>contains functions that .....</para>
           <indexterm zone="SpiderMonkey libmozjs185-1">
@@ -156,7 +147,7 @@
       </varlistentry>
 
       <varlistentry id="libmozjs185">
-        <term><filename class='libraryfile'>libmozjs185.so</filename></term>
+        <term><filename class="libraryfile">libmozjs185.so</filename></term>
         <listitem>
           <para>contains functions that .....</para>
           <indexterm zone="SpiderMonkey libmozjs185">
@@ -164,9 +155,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>

Modified: trunk/BOOK/template/template.xml
===================================================================
--- trunk/BOOK/template/template.xml	2012-02-16 16:38:18 UTC (rev 9434)
+++ trunk/BOOK/template/template.xml	2012-02-16 18:16:53 UTC (rev 9435)
@@ -86,19 +86,21 @@
 
     <!-- As required -->
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink>,
+    <para role="recommended"><ulink url="http://www.some.url/">EXTERNAL
+    DEPENDENCY</ulink>,
     <xref linkend="BLFS DEPENDENCY"/></para>
 
     <!-- As required -->
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
+    <para role="optional"><ulink url="http://www.some.url/">EXTERNAL
+    DEPENDENCY</ulink></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/TEMPLATE"/></para>
-
   </sect2>
 
-  <!-- Optional section for packages that need a specific kernel configuration-->
+  <!-- Optional section for packages that need a specific kernel
+  configuration-->
   <sect2 role="kernel" id='TEMPLATE-kernel'>
     <title>Kernel Configuration</title>
 
@@ -117,7 +119,6 @@
     <indexterm zone="TEMPLATE TEMPLATE-kernel">
       <primary sortas="d-TEMPLATE">TEMPLATE</primary>
     </indexterm>
-
   </sect2>
 
   <!--Required section-->
@@ -131,18 +132,18 @@
 <screen><userinput>./configure --prefix=/usr &&
 make</userinput></screen>
 
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
+    <!-- Optional section. Use one of the two mentions below about a test
+         suite, delete the line that is not applicable. Of course, if the
          test suite uses syntax other than 'make check', revise the
          line to reflect the actual syntax to run the test suite -->
 
     <para>This package does not come with a test suite.</para>
     <para>To test the results, issue: <command>make check</command>.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-
   </sect2>
 
   <!--Optional section-->
@@ -156,7 +157,6 @@
 
     <para><option>--OPTION</option>: This option does something optionally
     per the user's desires.</para>
-
   </sect2>
 
   <!--Optional section-->
@@ -173,7 +173,8 @@
       </indexterm>
 
       <indexterm zone="TEMPLATE TEMPLATE-config">
-        <primary sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
+        <primary
+        sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
       </indexterm>
     </sect3>
 
@@ -195,7 +196,6 @@
 
 # End FILENAME</literal>
 EOF</userinput></screen>
-
     </sect3>
 
     <sect3  id="TEMPLATE-init">
@@ -212,9 +212,7 @@
       </indexterm>
 
 <screen role="root"><userinput>make install-TEMPLATE</userinput></screen>
-
     </sect3>
-
   </sect2>
 
   <!--Required section-->
@@ -274,9 +272,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>




More information about the blfs-book mailing list