[blfs-book] r12157 - trunk/BOOK/x/lib

igor at higgs.linuxfromscratch.org igor at higgs.linuxfromscratch.org
Thu Nov 7 11:25:16 PST 2013


Author: igor
Date: Thu Nov  7 11:25:16 2013
New Revision: 12157

Log:
change qt instructions to not modify file timestamp from other packages but still prevent breakage if deviating from book instructions

Modified:
   trunk/BOOK/x/lib/qt4.xml
   trunk/BOOK/x/lib/qt5.xml

Modified: trunk/BOOK/x/lib/qt4.xml
==============================================================================
--- trunk/BOOK/x/lib/qt4.xml	Thu Nov  7 10:44:12 2013	(r12156)
+++ trunk/BOOK/x/lib/qt4.xml	Thu Nov  7 11:25:16 2013	(r12157)
@@ -249,6 +249,14 @@
     </para>
 
     <para>
+      Remove references to the build directory from the
+      <filename class="extension">.pc</filename> files by running
+      the following command:
+    </para>
+
+<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
+
+    <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
@@ -271,11 +279,12 @@
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>for file in `basename -a -s .prl /usr/lib/lib*.prl`; do
+<screen role="root"><userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
+            Designer Gui Help Multimedia Network OpenGL Script \
+            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml phonon
 do
-  sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
-       /usr/lib/${file}.prl
-  perl -pi -e "s, -L$PWD/?\S+,,g" /usr/lib/pkgconfig/${file##lib}.pc
+  [ -e /usr/lib/libQt${file}.prl ] && sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
+                                              /usr/lib/libQt${file}.prl
 done
 unset file</userinput></screen>
 
@@ -336,6 +345,14 @@
 make</userinput></screen>
 
     <para>
+      Remove references to the build directory from the
+      <filename class="extension">.pc</filename> files by running
+      the following command:
+    </para>
+
+<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
+
+    <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
@@ -359,10 +376,12 @@
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>for file in `basename -a -s .prl $QTDIR/lib/lib*.prl`; do
-  sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
-       $QTDIR/lib/${file}.prl
-  perl -pi -e "s, -L$PWD/?\S+,,g" $QTDIR/lib/pkgconfig/${file##lib}.pc
+<screen role="root"><userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
+            Designer Gui Help Multimedia Network OpenGL Script \
+            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml phonon;
+do
+  [ -e $QTDIR/lib/libQt${file}.prl ] && sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
+                                                $QTDIR/lib/libQt${file}.prl
 done
 
 unset file</userinput></screen>

Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml	Thu Nov  7 10:44:12 2013	(r12156)
+++ trunk/BOOK/x/lib/qt5.xml	Thu Nov  7 11:25:16 2013	(r12157)
@@ -237,7 +237,7 @@
 make</userinput></screen>
 
     <para>
-      Remove references to the build directory from the installed
+      Remove references to the build directory from the
       <filename class="extension">.pc</filename> files by running
       the following command:
     </para>
@@ -270,7 +270,7 @@
 
 <screen role="root"><userinput>sed -i -e "s:$PWD/qtbase:/usr/lib/qt5:g" \
     /usr/lib/qt5/mkspecs/modules/qt_lib_bootstrap.pri &&
-find /usr/lib/*.prl -exec sed -i -e \
+find /usr/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -e \
      '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;</userinput></screen>
 
     <para>



More information about the blfs-book mailing list