From f96a6d4272224c182d857f8981f3f28663305e6d Mon Sep 17 00:00:00 2001
From: "Thomas Trepl (Moody)" <thomas@linuxfromscratch.org>
Date: Wed, 29 Jun 2022 22:29:02 +0200
Subject: [PATCH] Adopt changes in ncurses to m32,mx32 instructions

---
 chapter06/ncurses.xml |  6 ++++--
 chapter08/ncurses.xml | 10 ++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index c21cd7056..8f7f102f9 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -209,9 +209,10 @@ CXX="$LFS_TGT-g++ -m32"             \
             --libdir=/usr/lib32     \
             --mandir=/usr/share/man \
             --with-shared           \
+            --without-normal        \
+            --with-cxx-shared       \
             --without-debug         \
             --without-ada           \
-            --without-normal        \
             --disable-stripping     \
             --enable-widec</userinput></screen>
 
@@ -248,9 +249,10 @@ CXX="$LFS_TGT-g++ -mx32"            \
             --libdir=/usr/libx32    \
             --mandir=/usr/share/man \
             --with-shared           \
+            --without-normal        \
+            --with-cxx-shared       \
             --without-debug         \
             --without-ada           \
-            --without-normal        \
             --disable-stripping     \
             --enable-widec</userinput></screen>
 
diff --git a/chapter08/ncurses.xml b/chapter08/ncurses.xml
index 5df908c6d..06b5f5a72 100644
--- a/chapter08/ncurses.xml
+++ b/chapter08/ncurses.xml
@@ -173,10 +173,11 @@ cp -v -R doc/* /usr/share/doc/ncurses-&ncurses-version;</userinput></screen>
       following commands:</para>
 
 <screen role="nodump"><userinput>make distclean
-./configure --prefix=/usr    \
-            --with-shared    \
-            --without-normal \
-            --without-debug  \
+./configure --prefix=/usr     \
+            --with-shared     \
+            --without-normal  \
+            --with-cxx-shared \
+            --without-debug   \
             --without-cxx-binding \
             --with-abi-version=5
 make sources libs
@@ -205,6 +206,7 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
             --with-shared           \
             --without-debug         \
             --without-normal        \
+            --with-cxx-shared       \
             --enable-pc-files       \
             --enable-widec          \
             --with-pkg-config-libdir=/usr/lib32/pkgconfig</userinput></screen>