Sfoglia il codice sorgente

Add an environment variable to util-linux
in Chapter 5 to prevent an installation error for
hosts that have unneeded capabilities availible.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10452 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Bruce Dubbs 11 anni fa
parent
commit
8ad94ab722
4 ha cambiato i file con 27 aggiunte e 8 eliminazioni
  1. 12 1
      chapter01/changelog.xml
  2. 1 2
      chapter05/ncurses.xml
  3. 12 3
      chapter05/util-linux.xml
  4. 2 2
      general.ent

+ 12 - 1
chapter01/changelog.xml

@@ -36,7 +36,18 @@
     </listitem>
 -->
     <listitem>
-      <para>2014-01-25</para>
+      <para>2014-01-27</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add an environment variable to util-linux
+          in Chapter 5 to prevent an installation error for 
+          hosts that have unneeded capabilities availible.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-01-26</para>
       <itemizedlist>
         <listitem>
           <para>[bdubbs] - Update to man-pages-3.57.  Fixes

+ 1 - 2
chapter05/ncurses.xml

@@ -45,8 +45,7 @@
 
     <para>Prepare Ncurses for compilation:</para>
 
-<screen><userinput remap="configure">
-./configure --prefix=/tools \
+<screen><userinput remap="configure">./configure --prefix=/tools \
             --with-shared   \
             --without-debug \
             --without-ada   \

+ 12 - 3
chapter05/util-linux.xml

@@ -42,9 +42,10 @@
 
     <para>Prepare Util-linux for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/tools             \
-            --disable-makeinstall-chown \
-            --without-systemdsystemunitdir</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools                \
+            --disable-makeinstall-chown    \
+            --without-systemdsystemunitdir \
+            PKG_CONFIG=""</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure option:</title>
@@ -67,6 +68,14 @@
           This switch disables the unnecessary action.</para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><envar>PKG_CONFIG=""</envar></term>
+        <listitem>
+          <para>Setting this envronment variable prevents adding unneeded
+          features that may be available on the host.</para>
+        </listitem>
+      </varlistentry>
      </variablelist>
 
     <para>Compile the package:</para>

+ 2 - 2
general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version         "SVN-20140126">
-<!ENTITY releasedate     "January 26, 2014">
+<!ENTITY version         "SVN-20140127">
+<!ENTITY releasedate     "January 27, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.5">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->