Changeset 793d016

Timestamp:

04/04/2012 01:54:27 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:

16efe57

Parents:

1265b05

Message:

Xulrunner/NSPR tweaks. This is above and beyond the call of duty...

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

File:

• x/lib/xulrunner.xml (modified) (2 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 '/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;
+if pkg-config --atleast-version &nspr-version; nspr
+then sed -i '/Version/aRequires: nspr &gt;= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in
+else sed -i '/Version/aRequires: mozilla-nspr &gt;= &nspr-version;' xulrunner/installer/libxul-embedding.pc.in
+fi &amp;&amp;
 make -f client.mk</userinput></screen>
 
@@ -235 +238 @@
 
     <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.
+      <command>if pkg-config --atleast-version &nspr-version; nspr;
+      then sed -i '/Version/aRequires: nspr &gt;= &nspr-version;'
+      xulrunner/installer/libxul-embedding.pc.in;
+      else sed -i '/Version/aRequires: mozilla-nspr &gt;= &nspr-version;'
+      xulrunner/installer/libxul-embedding.pc.in;
+      fi</command>: This uses <command>pkg-config</command> to see if
+      <xref linkend="nspr"/> is installed and then adds a line to require
+      <application>nspr</application> or <application>mozilla-nspr</application>
+      to <filename>libxul-embedding.pc</filename>. If you try to build some
+      other applications without this, the prtypes header from NSPR will not be
+      found.
     </para>