From 0ce8c189d3e4632c5b02dd3823d40fc325c3d63d Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Sun, 26 Apr 2020 17:04:36 +0000
Subject: [PATCH] Create util-linux-links for {,x}32-bit also

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11826 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/createfiles.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index a616f679a..a3722e468 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -60,13 +60,25 @@ done</userinput></screen>
   <para arch="ml_32,ml_all">32-bit builds also require these links:</para>
 
 <screen arch="ml_32,ml_all"><userinput>ln -sv /tools/lib32/libgcc_s.so{,.1}               /usr/lib32
-ln -sv /tools/lib32/libstdc++.{a,so{,.6}}          /usr/lib32</userinput></screen>
+ln -sv /tools/lib32/libstdc++.{a,so{,.6}}          /usr/lib32
+for lib in blkid mount uuid fdisk
+do
+    ln -sv /tools/lib32/lib$lib.so* /usr/lib32/
+    sed 's|/tools|/usr|' /tools/lib32/pkgconfig/${lib}.pc \
+        &gt; /usr/lib32/pkgconfig/${lib}.pc
+done</userinput></screen>
 
   <para arch="ml_x32,ml_all">x32-bit builds also require these links:</para>
 
 <screen arch="ml_x32,ml_all"><userinput>ln -sv /tools/libx32/libgcc_s.so{,.1}              /usr/libx32
 ln -sv /tools/libx32/libstdc++.{a,so{,.6}}         /usr/libx32
-ln -sv /usr/libx32 /</userinput></screen>
+ln -sv /usr/libx32 /
+for lib in blkid mount uuid fdisk
+do
+    ln -sv /tools/libx32/lib$lib.so* /usr/libx32/
+    sed 's|/tools|/usr|' /tools/libx32/pkgconfig/${lib}.pc \
+        &gt; /usr/libx32/pkgconfig/${lib}.pc
+done</userinput></screen>
 
   <variablelist>
     <title>The purpose of each link:</title>