Changeset d615263


Ignore:
Timestamp:
02/16/2012 06:16:53 PM (12 years ago)
Author:
Andrew Benton <andy@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
822075f
Parents:
503a0c83
Message:

SpiderMonkey tweaks

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

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • general/prog/spidermonkey.xml

    r503a0c83 rd615263  
    55  %general-entities;
    66
    7   <!ENTITY SpiderMonkey-download-http "https://ftp.mozilla.org/pub/mozilla.org/js/js185-&spidermonkey-version;.tar.gz">
    8   <!ENTITY SpiderMonkey-download-ftp  " ">
     7  <!ENTITY SpiderMonkey-download-http
     8  "http://ftp.mozilla.org/pub/mozilla.org/js/js185-&spidermonkey-version;.tar.gz">
     9  <!ENTITY SpiderMonkey-download-ftp
     10  "ftp://ftp.mozilla.org/pub/mozilla.org/js/js185-&spidermonkey-version;.tar.gz">
    911  <!ENTITY SpiderMonkey-md5sum        "a4574365938222adca0a6bd33329cb32">
    1012  <!ENTITY SpiderMonkey-size          "5.9 MB">
    … …  
    3941    <itemizedlist spacing="compact">
    4042      <listitem>
    41         <para>Download (HTTP): <ulink url="&SpiderMonkey-download-http;"/></para>
     43        <para>Download (HTTP):
     44        <ulink url="&SpiderMonkey-download-http;"/></para>
    4245      </listitem>
    4346      <listitem>
    … …  
    5861    </itemizedlist>
    5962
    60     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    61     <itemizedlist spacing='compact'>
    62       <listitem>
    63         <para>Recommended Patch: <ulink
    64         url="&patch-root;/js185-&spidermonkey-version;-DESTDIR-1.patch"/></para>
    65       </listitem>
    66     </itemizedlist>
    67 
    6863    <bridgehead renderas="sect3">SpiderMonkey Dependencies</bridgehead>
    6964
    … …  
    7570    <para condition="html" role="usernotes">User Notes:
    7671    <ulink url="&blfs-wiki;/SpiderMonkey"/></para>
    77 
    7872  </sect2>
    7973
    … …  
    8175    <title>Installation of SpiderMonkey</title>
    8276
    83     <para>Install <application>SpiderMonkey</application> by running the following
    84     commands:</para>
     77    <para>Install <application>SpiderMonkey</application> by running the
     78    following commands:</para>
    8579
    86 <screen><userinput>patch -Np1 -i ../js185-&spidermonkey-version;-DESTDIR-1.patch &amp;&amp;
    87 cd js/src &amp;&amp;
    88 ./configure --prefix=/usr \
    89             --enable-threadsafe \
    90             --with-system-nspr &amp;&amp;
     80<screen><userinput>cd js/src &amp;&amp;
     81sed -i 's#s \($(SHLIB_\(ABI\|EXACT\)_VER)\)#s $(notdir \1)#' Makefile.in &amp;&amp;
     82./configure --prefix=/usr --enable-threadsafe --with-system-nspr &amp;&amp;
    9183make</userinput></screen>
    9284
    9385    <para>To test the results, issue: <command>make check</command>.</para>
    9486
    95     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
     87    <para>Now, as the <systemitem class="username">root</systemitem>
     88    user:</para>
    9689
    9790<screen role="root"><userinput>make install</userinput></screen>
    98 
    9991  </sect2>
    10092
    … …  
    10294    <title>Command Explanations</title>
    10395
    104     <para><command>patch -Np1 -i ../js185-&spidermonkey-version;-DESTDIR-1.patch</command>:
    105     If <application>SpiderMonkey</application> is installed in a DESTDIR, this patch fixes
    106     the symlinks for <filename>libmozjs185.so</filename> so that they do not point to the
    107     <emphasis>build</emphasis> tree.</para>
     96    <para><command>sed -i 's#s \($(SHLIB_\(ABI\|EXACT\)_VER)\)#s $(notdir \1)#'
     97    Makefile.in</command>: This sed fixes
     98    the symlinks for <filename>libmozjs185.so</filename> so that they are
     99    relative and not absolute symlinks.</para>
    108100
    109     <para><parameter>--enable-threadsafe</parameter>: This switch enables support
    110     for multiple threads.</para>
     101    <para><parameter>--enable-threadsafe</parameter>: This switch enables
     102    support for multiple threads.</para>
    111103
    112104    <para><parameter>--with-system-nspr</parameter>: This parameter forces the
    113105    package to link to the system version of <application>nspr</application>
    114106    instead of using its included, and now old, version.</para>
    115 
    116107  </sect2>
    117108
    … …  
    147138
    148139      <varlistentry id="libmozjs185-1">
    149         <term><filename class='libraryfile'>libmozjs185-1.0.a</filename></term>
     140        <term><filename class="libraryfile">libmozjs185-1.0.a</filename></term>
    150141        <listitem>
    151142          <para>contains functions that .....</para>
    … …  
    157148
    158149      <varlistentry id="libmozjs185">
    159         <term><filename class='libraryfile'>libmozjs185.so</filename></term>
     150        <term><filename class="libraryfile">libmozjs185.so</filename></term>
    160151        <listitem>
    161152          <para>contains functions that .....</para>
    … …  
    165156        </listitem>
    166157      </varlistentry>
    167 
    168158    </variablelist>
    169 
    170159  </sect2>
    171 
    172160</sect1>

  • template/template.xml

    r503a0c83 rd615263  
    8787    <!-- As required -->
    8888    <bridgehead renderas="sect4">Recommended</bridgehead>
    89     <para role="recommended"><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink>,
     89    <para role="recommended"><ulink url="http://www.some.url/">EXTERNAL
     90    DEPENDENCY</ulink>,
    9091    <xref linkend="BLFS DEPENDENCY"/></para>
    9192
    9293    <!-- As required -->
    9394    <bridgehead renderas="sect4">Optional</bridgehead>
    94     <para role="optional"><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
     95    <para role="optional"><ulink url="http://www.some.url/">EXTERNAL
     96    DEPENDENCY</ulink></para>
    9597
    9698    <para condition="html" role="usernotes">User Notes:
    9799    <ulink url="&blfs-wiki;/TEMPLATE"/></para>
    98 
    99   </sect2>
    100 
    101   <!-- Optional section for packages that need a specific kernel configuration-->
     100  </sect2>
     101
     102  <!-- Optional section for packages that need a specific kernel
     103  configuration-->
    102104  <sect2 role="kernel" id='TEMPLATE-kernel'>
    103105    <title>Kernel Configuration</title>
    … …  
    118120      <primary sortas="d-TEMPLATE">TEMPLATE</primary>
    119121    </indexterm>
    120 
    121122  </sect2>
    122123
    … …  
    132133make</userinput></screen>
    133134
    134     <!-- Use one of the two mentions below about a test suite,
    135          delete the line that is not applicable. Of course, if the
     135    <!-- Optional section. Use one of the two mentions below about a test
     136         suite, delete the line that is not applicable. Of course, if the
    136137         test suite uses syntax other than 'make check', revise the
    137138         line to reflect the actual syntax to run the test suite -->
    … …  
    140141    <para>To test the results, issue: <command>make check</command>.</para>
    141142
    142     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
     143    <para>Now, as the <systemitem class="username">root</systemitem>
     144    user:</para>
    143145
    144146<screen role="root"><userinput>make install</userinput></screen>
    145 
    146147  </sect2>
    147148
    … …  
    157158    <para><option>--OPTION</option>: This option does something optionally
    158159    per the user's desires.</para>
    159 
    160160  </sect2>
    161161
    … …  
    174174
    175175      <indexterm zone="TEMPLATE TEMPLATE-config">
    176         <primary sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
     176        <primary
     177        sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
    177178      </indexterm>
    178179    </sect3>
    … …  
    196197# End FILENAME</literal>
    197198EOF</userinput></screen>
    198 
    199199    </sect3>
    200200
    … …  
    213213
    214214<screen role="root"><userinput>make install-TEMPLATE</userinput></screen>
    215 
    216215    </sect3>
    217 
    218216  </sect2>
    219217
    … …  
    275273        </listitem>
    276274      </varlistentry>
    277 
    278275    </variablelist>
    279 
    280   </sect2>
    281 
     276  </sect2>
    282277</sect1>
Note: See TracChangeset for help on using the changeset viewer.