From 9d1c90331a85ff29488a768ee071ed5d0635341f Mon Sep 17 00:00:00 2001
From: "Thomas Trepl (Moody)" <thomas@linuxfromscratch.org>
Date: Sat, 8 Jan 2022 18:19:25 +0100
Subject: [PATCH] Adopt instructions for work with v3.x

---
 chapter08/openssl.xml | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml
index f90995d42..e9d5d54ca 100644
--- a/chapter08/openssl.xml
+++ b/chapter08/openssl.xml
@@ -112,15 +112,13 @@ make MANSUFFIX=ssl install</userinput></screen>
 
     <para>Prepare OpenSSL for compilation:</para>
 
-<screen><userinput remap="configure">MACHINE="i686"             \
-CC="gcc -m32 -march=i686"  \
-CXX="g++ -m32 -march=i686" \
-    ./config               \
-    --prefix=/usr          \
-    --openssldir=/etc/ssl  \
-    --libdir=lib32         \
-    shared                 \
-    zlib-dynamic</userinput></screen>
+<screen><userinput remap="configure">CFLAGS="-m32 -march=i686 -Wall -O3" CXXFLAGS="$CFLAGS" \
+./config --prefix=/usr         \
+         --openssldir=/etc/ssl \
+         --libdir=lib32        \
+         shared                \
+         zlib-dynamic          \
+         linux-generic32</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -147,15 +145,13 @@ rm -rf DESTDIR</userinput></screen>
 
     <para>Prepare OpenSSL for compilation:</para>
 
-<screen><userinput remap="configure">MACHINE="x86_64"          \
-CC="gcc -mx32"            \
-CXX="g++ -mx32"           \
-    ./config              \
-    --prefix=/usr         \
-    --openssldir=/etc/ssl \
-    --libdir=libx32       \
-    shared                \
-    zlib-dynamic</userinput></screen>
+<screen><userinput remap="configure">CFLAGS="-mx32 -march=x86-64 -Wall -O3" CXXFLAGS="$CFLAGS" \
+./config --prefix=/usr         \
+         --openssldir=/etc/ssl \
+         --libdir=libx32       \
+         shared                \
+         zlib-dynamic          \
+         linux-x32</userinput></screen>
 
     <para>Compile the package:</para>