linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-25 07:42:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12157 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Igor Živković 2013-11-07 19:25:16 +00:00
parent caa5cddd42
commit acacfb6499
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
x/lib/qt4.xml
View File

@ -248,6 +248,14 @@ make</userinput></screen>
This package does not come with a test suite.
</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 @@ install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
<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 ] &amp;&amp; sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
/usr/lib/libQt${file}.prl
done
unset file</userinput></screen>
@ -335,6 +344,14 @@ export QTDIR=/opt/qt-&qt4-version;
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 @@ install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
<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 ] &amp;&amp; sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
$QTDIR/lib/libQt${file}.prl
done
unset file</userinput></screen>

4
x/lib/qt5.xml
View File

@ -237,7 +237,7 @@ sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
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 @@ install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
<screen role="root"><userinput>sed -i -e "s:$PWD/qtbase:/usr/lib/qt5:g" \
/usr/lib/qt5/mkspecs/modules/qt_lib_bootstrap.pri &amp;&amp;
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>