Changeset 1464543

Timestamp:

04/08/2012 07:46:30 PM (12 years ago)

Author:

Ragnar Thomsen <rthomsen@…>

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:

2001b3e

Parents:

2a38269

Message:

Correct Qt configuration.

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/qt4.xml (modified) (7 diffs)

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "07">                   <!-- Always 2 digits -->
+<!ENTITY day          "08">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10 +10 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 7th, &year;">
+<!ENTITY releasedate  "April 8th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->

introduction/welcome/changelog.xml

@@ -43 +43 @@
 -->
     <listitem>
+      <para>April 8th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[rthomsen] - Corrected Qt configuration. Thanks to Pierre Labastie for the report.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 7th, 2012</para>
       <itemizedlist>

x/lib/qt4.xml

@@ -194 +194 @@
 <screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-gcc_fix-1.patch &amp;&amp;
 patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-glib_fix-1.patch &amp;&amp;
+sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &amp;&amp;
 ./configure -prefix /opt/qt-&qt4-version;  \
             -release               \
@@ -201 +202 @@
             -no-nis                \
             -opensource            \
-            -confirm-license</userinput></screen>
+            -confirm-license &amp;&amp;
+make</userinput></screen>
     
     <note><title>Phonon</title>
@@ -209 +211 @@
     <application>Phonon</application> libraries will be installed which better
     matches the needs of the <application>KDE4</application> desktop.</para></note>
-       
-    <para>If you are compiling with <application>GCC</application> 4.7 you need
-    to suppress some warnings that would otherwise cause the build to fail. This 
-    can be achieved by modifying some Makefiles:</para>
-    
-    <screen><userinput>find src/3rdparty/webkit/Source/{WebCore,WebKit} -name 'Makefile*' -exec sed -i 's@-Werror @@' {} \;</userinput></screen>
-
-    <para>Now, build the package:</para>
-    
-    <screen><userinput>make</userinput></screen>
-    
+           
     <para>This package does not come with a test suite.</para>
 
@@ -230 +222 @@
     again as the <systemitem class="username">root</systemitem> user issue:</para>
 
-<screen role="root"><userinput>ln -v -sfn qt-&qt4-version; /opt/qt</userinput></screen>
+<screen role="root"><userinput>ln -svfn qt-&qt4-version; /opt/qt</userinput></screen>
 
   </sect2>
@@ -241 +233 @@
     4.7 and <application>GLib</application> 2.32.</para>
     
+    <para><command>sed -i '/-Werror/d'...</command>:
+    This sed suppresses warnings that would otherwise cause the build 
+    to fail when compiling with <application>GCC</application>
+    4.7.</para>
+   
+    <para><parameter>-release</parameter>:
+    This switch disables building with debugging symbols.</para>
+    
     <para><parameter>-nomake examples, -nomake demos</parameter>:
     These switches disable building programs that are only of interest
     to a <application>Qt4</application> developer.</para>
-
-    <para>There are several optional directories that can be specified in the
-    <command>./configure</command> line.  These include
-    <option>-bindir</option>, <option>-libdir</option>,
-    <option>-docdir</option>, and <option>-headerdir</option>.  For a complete
-    list, run <command>./configure -help</command>.</para>
+    
+    <para><parameter>-system-sqlite</parameter>:
+    Use the system version of <application>SQLite</application>.</para>
+    
+    <para><parameter>-no-nis</parameter>:
+    Disable support for Network Information Service (NIS).</para>
+    
+    <para><parameter>-opensource</parameter>:
+    Install the opensource version of <application>Qt</application>.</para>
+    
+    <para><parameter>-confirm-license</parameter>:
+    Accept license without prompting user during configuration.</para>
 
     <para><parameter>-plugin-sql-<replaceable>&lt;driver&gt;</replaceable></parameter>
@@ -262 +268 @@
       <command>configure</command> parameters.</para>
     </note>
+    
+    <para>There are several optional directories that can be specified in the
+    <command>./configure</command> line.  These include
+    <option>-bindir</option>, <option>-libdir</option>,
+    <option>-docdir</option>, and <option>-headerdir</option>.  For a complete
+    list, run <command>./configure -help</command>.</para>
 
   </sect2>
@@ -296 +308 @@
       the <filename>/etc/profile.d/qt4.sh</filename> file:</para>
 
-<screen><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; "EOF"
 # Begin /etc/profile.d/qt4.sh