From 9282602849aa50dff09b9cadf07490f17675ad1d Mon Sep 17 00:00:00 2001
From: "Thomas Trepl (Moody)" <thomas@linuxfromscratch.org>
Date: Sun, 21 Aug 2022 10:05:41 +0200
Subject: [PATCH] Adopt change instructions to m32/mx32

---
 chapter07/util-linux.xml | 10 ++++++----
 chapter08/attr.xml       |  4 +++-
 chapter08/eudev.xml      |  6 ++----
 chapter08/expat.xml      |  6 ++++--
 chapter08/kmod.xml       |  2 ++
 chapter08/readline.xml   |  6 ++++--
 chapter08/stripping.xml  |  6 ++++--
 chapter08/wheel.xml      |  2 +-
 8 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/chapter07/util-linux.xml b/chapter07/util-linux.xml
index 899eea993..a774e89b4 100644
--- a/chapter07/util-linux.xml
+++ b/chapter07/util-linux.xml
@@ -141,6 +141,8 @@
 
 <screen><userinput remap="configure">CC="gcc -m32" \
 ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime    \
+            --libdir=/usr/lib32      \
+            --host=i686-pc-linux-gnu \
             --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
             --disable-login      \
@@ -151,8 +153,7 @@
             --disable-pylibmount \
             --disable-static     \
             --without-python     \
-            --libdir=/usr/lib32      \
-            --host=i686-pc-linux-gnu</userinput></screen>
+            runstatedir=/run</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -181,6 +182,8 @@ rm -rf DESTDIR</userinput></screen>
 
 <screen><userinput remap="configure">CC="gcc -mx32" \
 ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime    \
+            --libdir=/usr/libx32 \
+            --host=x86_64-pc-linux-gnux32 \
             --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
             --disable-login      \
@@ -191,8 +194,7 @@ rm -rf DESTDIR</userinput></screen>
             --disable-pylibmount \
             --disable-static     \
             --without-python     \
-            --libdir=/usr/libx32 \
-            --host=x86_64-pc-linux-gnux32</userinput></screen>
+            runstatedir=/run</userinput></screen>
 
     <para>Compile the package:</para>
 
diff --git a/chapter08/attr.xml b/chapter08/attr.xml
index 796e86bac..28a07b331 100644
--- a/chapter08/attr.xml
+++ b/chapter08/attr.xml
@@ -80,7 +80,8 @@
 <screen><userinput remap="configure">CC="gcc -m32" ./configure \
     --prefix=/usr         \
     --disable-static      \
-    --libdir=/usr/lib32 \
+    --sysconfdir=/etc     \
+    --libdir=/usr/lib32   \
     --host=i686-pc-linux-gnu</userinput></screen>
 
     <para>Compile the package:</para>
@@ -111,6 +112,7 @@ rm -rf DESTDIR</userinput></screen>
 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
     --prefix=/usr          \
     --disable-static       \
+    --sysconfdir=/etc      \
     --libdir=/usr/libx32   \
     --host=x86_64-pc-linux-gnux32</userinput></screen>
 
diff --git a/chapter08/eudev.xml b/chapter08/eudev.xml
index 8b2a846d9..6e7b83c15 100644
--- a/chapter08/eudev.xml
+++ b/chapter08/eudev.xml
@@ -104,8 +104,7 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
             --libdir=/usr/lib32            \
             --sysconfdir=/etc              \
             --disable-manpages             \
-            --disable-static               \
-            --config-cache</userinput></screen>
+            --disable-static</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -139,8 +138,7 @@ rm -rf DESTDIR</userinput></screen>
             --libdir=/usr/libx32           \
             --sysconfdir=/etc              \
             --disable-manpages             \
-            --disable-static               \
-            --config-cache</userinput></screen>
+            --disable-static</userinput></screen>
 
     <para>Compile the package:</para>
 
diff --git a/chapter08/expat.xml b/chapter08/expat.xml
index 815f4174a..fd9654eea 100644
--- a/chapter08/expat.xml
+++ b/chapter08/expat.xml
@@ -81,7 +81,8 @@ make clean</userinput></screen>
     <para>Prepare Expat for compilation:</para>
 
 <screen><userinput remap="configure">CC="gcc -m32" ./configure \
-    --prefix=/usr         \
+    --prefix=/usr        \
+    --disable-static     \
     --libdir=/usr/lib32  \
     --host=i686-pc-linux-gnu</userinput></screen>
 
@@ -113,7 +114,8 @@ make clean</userinput></screen>
     <para>Prepare Expat for compilation:</para>
 
 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
-    --prefix=/usr         \
+    --prefix=/usr        \
+    --disable-static     \
     --libdir=/usr/libx32 \
     --host=x86_64-pc-linux-gnux32</userinput></screen>
 
diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml
index 67b637d9d..19df8560d 100644
--- a/chapter08/kmod.xml
+++ b/chapter08/kmod.xml
@@ -118,6 +118,7 @@ make clean</userinput></screen>
     --prefix=/usr                 \
     --libdir=/usr/lib32           \
     --sysconfdir=/etc             \
+    --with-openssl                \
     --with-xz                     \
     --with-zstd                   \
     --with-zlib                   \
@@ -155,6 +156,7 @@ make clean</userinput></screen>
     --prefix=/usr                 \
     --libdir=/usr/libx32          \
     --sysconfdir=/etc             \
+    --with-openssl                \
     --with-xz                     \
     --with-zstd                   \
     --with-zlib                   \
diff --git a/chapter08/readline.xml b/chapter08/readline.xml
index 76237236a..a90ecb5c6 100644
--- a/chapter08/readline.xml
+++ b/chapter08/readline.xml
@@ -117,7 +117,8 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
     --host=i686-pc-linux-gnu      \
     --prefix=/usr                 \
     --libdir=/usr/lib32           \
-    --disable-static</userinput></screen>
+    --disable-static              \
+    --with-curses</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -148,7 +149,8 @@ rm -rf DESTDIR</userinput></screen>
     --host=x86_64-pc-linux-gnux32 \
     --prefix=/usr                 \
     --libdir=/usr/libx32          \
-    --disable-static</userinput></screen>
+    --disable-static              \
+    --with-curses</userinput></screen>
 
     <para>Compile the package:</para>
 
diff --git a/chapter08/stripping.xml b/chapter08/stripping.xml
index bebb31932..df67235c9 100644
--- a/chapter08/stripping.xml
+++ b/chapter08/stripping.xml
@@ -132,7 +132,8 @@ for i in $(find /usr/lib -type f -name \*.so* ! -name \*dbg) \
             ;;
     esac
 done</userinput><userinput arch="ml_32,ml_all">
-for i in $(find /usr/lib32 -type f -name \*.so* ! -name \*dbg); do
+for i in $(find /usr/lib32 -type f -name \*.so* ! -name \*dbg) \
+         $(find /usr/lib32 -type f -name \*.a); do
     case "$online_usrbin $online_usrlib $save_usrlib" in
         *$(basename $i)* )
             ;;
@@ -140,7 +141,8 @@ for i in $(find /usr/lib32 -type f -name \*.so* ! -name \*dbg); do
             ;;
     esac
 done</userinput><userinput arch="ml_x32,ml_all">
-for i in $(find /usr/libx32 -type f -name \*.so* ! -name \*dbg); do
+for i in $(find /usr/libx32 -type f -name \*.so* ! -name \*dbg) \
+         $(find /usr/libx32 -type f -name \*.a); do
     case "$online_usrbin $online_usrlib $save_usrlib" in
         *$(basename $i)* )
             ;;
diff --git a/chapter08/wheel.xml b/chapter08/wheel.xml
index 0f6ba7cb6..f49ada356 100644
--- a/chapter08/wheel.xml
+++ b/chapter08/wheel.xml
@@ -86,7 +86,7 @@
         <seg>wheel</seg>
         <seg>
            /usr/lib/python&python-minor;/site-packages/wheel and
-           /usr/lib/python&python-minor;/site-packages/wheel-0.37.1-py3.10.egg-info
+           /usr/lib/python&python-minor;/site-packages/wheel-&wheel-version;-py&python-minor;.egg-info
         </seg>
       </seglistitem>
     </segmentedlist>