Changeset 16efe57

Timestamp:

04/04/2012 03:56:08 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:

b963d161

Parents:

793d016

Message:

more xulrunner library tweaks.
Thanks DJ.

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

File:

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

x/lib/xulrunner.xml

@@ -201 +201 @@
 <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 's#-L${sdkdir}/lib ##' xulrunner/installer/*.pc.in &amp;&amp;
 if pkg-config --atleast-version &nspr-version; nspr
 then sed -i '/Version/aRequires: nspr &gt;= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in
@@ -221 +220 @@
 ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &amp;&amp;
 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}
+for library in /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/*.so
 do ln -sfv ${library#/usr/lib/} /usr${library#*sdk}
 done</userinput></screen>
@@ -252 +251 @@
 
     <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>
-
-    <para>
       <command>make -f client.mk ...</command>: Mozilla products are packaged to
       allow the use of a configuration file which can be used to pass the
@@ -277 +268 @@
     <para>
       <command>for library in
-      /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/*.{a,so}; do ln -sfv
+      /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/*.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
+      relative symbolic links to the shared libraries from
       <filename class="directory">/usr/lib</filename>.
     </para>