From ff4ea30e8876455b8f94e6812beacddcd093240b Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Thu, 27 Feb 2025 19:06:18 +0100
Subject: [PATCH] Adopt instruction change to m32,mx32

---
 chapter08/kmod.xml | 64 +++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 35 deletions(-)

diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml
index f59837b6e..bad23a476 100644
--- a/chapter08/kmod.xml
+++ b/chapter08/kmod.xml
@@ -87,33 +87,30 @@ meson setup --prefix=/usr ..    \
   <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Kmod - 32bit</title>
 
-    <para>Clean previous build but keep man pages as they cannot
-    be recreated since xsltproc isn't installed yet:</para>
-
-<screen><userinput remap="pre">sed -e "s/^CLEANFILES =.*/CLEANFILES =/" -i man/Makefile
-make clean</userinput></screen>
+    <para>Clean previous build:</para>
+    
+<screen><userinput remap="pre">cd .. &amp;&amp;
+rm -rf build &amp;&amp;
+cd build</userinput></screen>
 
     <para>Prepare Kmod for compilation:</para>
 
-<screen><userinput remap="configure">CC="gcc -m32" ./configure \
-    --host=i686-pc-linux-gnu      \
-    --prefix=/usr                 \
-    --libdir=/usr/lib32           \
-    --sysconfdir=/etc             \
-    --with-openssl                \
-    --with-xz                     \
-    --with-zstd                   \
-    --with-zlib                   \
-    --disable-manpages            \
-    --with-rootlibdir=/usr/lib32</userinput></screen>
+<screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \
+CC="gcc -m32 -march=i686"              \
+CXX="g++ -m32 -march=i686"             \
+meson setup --prefix=/usr ..    \
+            --sbindir=/usr/sbin \
+            --buildtype=release \
+            --libdir=/usr/lib32 \
+            -D manpages=false</userinput></screen>
 
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">ninja</userinput></screen>
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
+<screen><userinput remap="install">DESTDIR=$PWD/DESTDIR ninja install
 cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -126,33 +123,30 @@ rm -rf DESTDIR</userinput></screen>
   <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Kmod - x32bit</title>
 
-    <para>Clean previous build but keep man pages as they cannot
-    be recreated since xsltproc isn't installed yet:</para>
+    <para>Clean previous build:</para>
 
-<screen><userinput remap="pre">sed -e "s/^CLEANFILES =.*/CLEANFILES =/" -i man/Makefile
-make clean</userinput></screen>
+<screen><userinput remap="pre">cd .. &amp;&amp;
+rm -rf build &amp;&amp;
+cd build</userinput></screen>
 
     <para>Prepare Kmod for compilation:</para>
 
-<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
-    --host=x86_64-pc-linux-gnux32 \
-    --prefix=/usr                 \
-    --libdir=/usr/libx32          \
-    --sysconfdir=/etc             \
-    --with-openssl                \
-    --with-xz                     \
-    --with-zstd                   \
-    --with-zlib                   \
-    --disable-manpages            \
-    --with-rootlibdir=/usr/libx32</userinput></screen>
+<screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \
+CC="gcc -mx32"                          \
+CXX="g++ -mx32"                         \
+meson setup --prefix=/usr ..    \
+            --sbindir=/usr/sbin \
+            --buildtype=release \
+            --libdir=/usr/libx32 \
+            -D manpages=false</userinput></screen>
 
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">ninja</userinput></screen>
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
+<screen><userinput remap="install">DESTDIR=$PWD/DESTDIR ninja install
 cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>