Quellcode durchsuchen

Change ncurses instructions to create and install .pc files.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10113 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Bruce Dubbs vor 12 Jahren
Ursprung
Commit
c0220ed5ba
3 geänderte Dateien mit 26 neuen und 13 gelöschten Zeilen
  1. 11 0
      chapter01/changelog.xml
  2. 13 11
      chapter06/ncurses.xml
  3. 2 2
      general.ent

+ 11 - 0
chapter01/changelog.xml

@@ -35,6 +35,17 @@
       </itemizedlist>
     </listitem>
 -->
+
+    <listitem>
+      <para>2013-01-30</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Change ncurses instructions to create
+          and install .pc files.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2013-01-29</para>
       <itemizedlist>

+ 13 - 11
chapter06/ncurses.xml

@@ -57,6 +57,7 @@
             --mandir=/usr/share/man \
             --with-shared           \
             --without-debug         \
+            --enable-pc-files       \
             --enable-widec</userinput></screen>
 
     <variablelist>
@@ -76,16 +77,13 @@
         </listitem>
       </varlistentry>
 
-      <!--
       <varlistentry>
-        <term><parameter>- -without-cxx-binding</parameter></term>
+        <term><parameter>--enable-pc-files</parameter></term>
         <listitem>
-          <para>This optional switch causes the
-          <filename class="libraryfile">libncurses++w.a</filename> library
-          not to be built. Nothing in LFS and BLFS uses this library.</para>
+          <para>This switch generates and installs .pc files for pkg-config.
+          </para>
         </listitem>
       </varlistentry>
-      -->
 
     </variablelist>
 
@@ -119,9 +117,10 @@
     wide-character libraries by means of symlinks and linker scripts:</para>
 
 <screen><userinput remap="install">for lib in ncurses form panel menu ; do 
-    rm -vf /usr/lib/lib${lib}.so 
-    echo "INPUT(-l${lib}w)" &gt;/usr/lib/lib${lib}.so
-    ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
+    rm -vf                    /usr/lib/lib${lib}.so 
+    echo "INPUT(-l${lib}w)" &gt; /usr/lib/lib${lib}.so
+    ln -sfv lib${lib}w.a      /usr/lib/lib${lib}.a
+    ln -sfv ${lib}w.pc        /usr/lib/pkgconfig/${lib}.pc
 done
 
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen>
@@ -149,8 +148,11 @@ cp -v -R doc/* /usr/share/doc/ncurses-&ncurses-version;</userinput></screen>
       the package again with the following commands:</para>
 
 <screen role="nodump"><userinput>make distclean
-./configure --prefix=/usr --with-shared --without-normal \
-  --without-debug --without-cxx-binding
+./configure --prefix=/usr    \
+            --with-shared    \
+            --without-normal \
+            --without-debug  \
+            --without-cxx-binding
 make sources libs
 cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
     </note>

+ 2 - 2
general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20130129">
-<!ENTITY releasedate "January 29, 2013">
+<!ENTITY version "SVN-20130130">
+<!ENTITY releasedate "January 30, 2013">
 <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->