Changeset effe07a for chapter06/createfiles.xml

Timestamp:

04/19/2020 02:45:08 PM (4 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

0b403eb3

Parents:

924667e

Message:

Fix circular deps between util-linux and eudev/systemd:

• build util-linux in chapter 5 for both books
• move eudev before util-linux in chapter 6
• make utils-linux libs and headers accessible to /usr in "Creating essential ..."
• not related, but forgotten at previous commit: make also libfl flex library accessible to /usr

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

File:

• chapter06/createfiles.xml (modified) (3 diffs)

chapter06/createfiles.xml

@@ -44 +44 @@
 ln -sv /tools/lib/libgcc_s.so{,.1}                  /usr/lib
 ln -sv /tools/lib/libstdc++.{a,so{,.6}}             /usr/lib
-
-ln -sv bash /bin/sh</userinput></screen>
-
-<!--for lib in blkid lzma mount uuid
+ln -sv /tools/lib/libfl.so*                         /usr/lib
+
+ln -sv bash /bin/sh
+
+for lib in blkid mount uuid fdisk
 do
     ln -sv /tools/lib/lib$lib.so* /usr/lib
-done-->
-<!--ln -svf /tools/include/blkid    /usr/include
-ln -svf /tools/include/libmount /usr/include
-ln -svf /tools/include/uuid     /usr/include-->
-<!--for pc in blkid mount uuid
+    sed 's|/tools|/usr|' /tools/lib/pkgconfig/${lib}.pc \
+        &gt; /usr/lib/pkgconfig/${lib}.pc
+done
+for incdir in blkid libmount uuid libfdisk
 do
-    sed 's@tools@usr@g' /tools/lib/pkgconfig/${pc}.pc \
-        > /usr/lib/pkgconfig/${pc}.pc
-done-->
+    ln -svf /tools/include/$incdir    /usr/include
+done</userinput></screen>
+
   <variablelist>
     <title>The purpose of each link:</title>
@@ -165 +165 @@
       </listitem>
     </varlistentry>
-<!--
-    <varlistentry>
-      <term><parameter><filename>/usr/lib/libstdc++.la</filename></parameter></term>
-      <listitem>
-        <para>This prevents a <filename class="directory">/tools</filename>
-        reference that would otherwise be in
-        <filename>/usr/lib/libstdc++.la</filename> after GCC is installed.</para>
-      </listitem>
-    </varlistentry>
--->
-    <!--<varlistentry revision="systemd">-->
-<!--    <varlistentry>
-      <term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term>
-      <listitem>
-        <para>These links prevent utilities from acquiring an
-        unnecessary reference to the
-        <filename class="directory">/tools</filename> directory.</para>
-      </listitem>
-    </varlistentry>-->
 
     <varlistentry>
@@ -189 +170 @@
       <listitem>
         <para>Many shell scripts hard-code <filename>/bin/sh</filename>.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>
+        <parameter><filename>/usr/lib/libfl.so*</filename></parameter>
+      </term>
+      <listitem>
+        <para>This link allows binutils to find the flex library, and to
+        build enhanced versions of ar and ranlib.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>
+        <parameter>
+          <filename>/usr/lib/lib{blkid,fdisk,mount,uuid}.so*</filename>,
+          <filename>/usr/include/{blkid,libfdisk,libmount,uuid}</filename>,
+          <filename>/usr/lib/pkgconfig/{blkid,fdisk,mount,uuid}.pc</filename>
+        </parameter>
+      </term>
+      <listitem>
+        <para>These links and files allow
+        <phrase revision="sysv">eudev</phrase>
+        <phrase revision="systemd">systemd</phrase> to find the
+        util-linux libraries installed in chapter 5, without creating
+        wrong references to /tools. The uuid library is also needed for
+        building a python module.</para>
       </listitem>
     </varlistentry>