Changeset 1265b05

Timestamp:

04/04/2012 01:06:59 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:

793d016

Parents:

e01e550b

Message:

Xulrunner tweaks

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

File:

• x/lib/xulrunner.xml (modified) (5 diffs)

x/lib/xulrunner.xml

@@ -73 +73 @@
         <para>
           Estimated build time: &xulrunner-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch if you're using <application>GCC-4.7</application>:
+          <ulink url="&patch-root;/xulrunner-&xulrunner-version;_gcc-4.7-1.patch"/>
         </para>
       </listitem>
@@ -189 +199 @@
     </para>
 
-<screen><userinput>sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' configure &amp;&amp;
+<screen><userinput>patch -p1 &lt; ../xulrunner-&xulrunner-version;_gcc-4.7-1.patch &amp;&amp;
+sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' configure &amp;&amp;
 sed -i '/Version/aRequires: nspr &gt;= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in &amp;&amp;
+sed -i 's#-L${sdkdir}/lib ##' xulrunner/installer/*.pc.in &amp;&amp;
 make -f client.mk</userinput></screen>
 
@@ -205 +217 @@
 rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins &amp;&amp;
 ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &amp;&amp;
-chown -Rv root:root /usr/{include,lib,share/idl}/xulrunner-*</userinput></screen>
-
-    <para>
-      If you elected to use the included NSPR and NSS (ie, if you have
-      <emphasis>not</emphasis> installed <xref linkend="nspr"/> and
-      <xref linkend="nss"/>), while still the
-      <systemitem class="username">root</systemitem> user, complete the
-      installation with the following commands:
-    </para>
-
-<screen role="root"><userinput>for DL in libnss3.so libnssutil3.so libsmime3.so \
-  libssl3.so libsoftokn3.so  libplds4.so libplc4.so libnspr4.so
-do ln -sv xulrunner-&xulrunner-version;/${DL} /usr/lib
-done &amp;&amp;
-unset DL</userinput></screen>
+chown -Rv root:root /usr/{include,lib,share/idl}/xulrunner-* &amp;&amp;
+for library in /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/*.{a,so}
+do ln -sfv ${library#/usr/lib/} /usr${library#*sdk}
+done</userinput></screen>
   </sect2>
 
@@ -231 +232 @@
       you have libvpx-v0.9.7 or earlier installed or if you've not installed
       <application>Libvpx</application>.
-        </para>
+    </para>
 
     <para>
       <command>sed ... Requires: nspr</command>: If you try to build some other
       applications without this, the prtypes header from NSPR will not be found.
+    </para>
+
+    <para>
+      <command>sed -i 's#-L${sdkdir}/lib ##'
+      xulrunner/installer/*.pc.in</command>: Because we put symlinks to the
+      libraries into <filename class="directory">/usr/lib</filename> we do not
+      need to have -L/usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib in
+      the linker flags provided by the pkg-config .pc files.
     </para>
 
@@ -255 +264 @@
 
     <para>
-      <command>for DL in ...</command>: The NSPR and NSS libraries shipped
-      with this package are installed into
-      <filename class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename>
-      which means they will not be found at runtime. By using symbolic links
-      from <filename class="directory">/usr/lib</filename> the libraries will be
-      found and the links can be easily changed to point to a newer version
-      during an upgrade.
-    </para>
-
-    <note>
-      <para>
-        When you upgrade Xulrunner, remember to update the symlinks.
-      </para>
-    </note>
+      <command>for library in
+      /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/*.{a,so}; do ln -sfv
+      ${library#/usr/lib/} /usr${library#*sdk}; done</command>: The libraries
+      shipped with this package are installed into
+      <filename class="directory">/usr/lib/xulrunner-devel-&xulrunner-version;</filename>
+      which means they will not be found at runtime. These commands make
+      relative symbolic links to the libraries from
+      <filename class="directory">/usr/lib</filename>.
+    </para>
   </sect2>