[lfs] 02/02: Adopt changes in glibc to the m{,x}32 variants

"Git Owner" ([email protected] via lfs-book Mailing List) <[email protected]>
Newsgroups gmane.linux.lfs.book
Message-ID <[email protected]>
This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch multilib
in repository lfs.

commit fa5dc14333af5368e43a43a948e6bc5ef82512c5
Author: Thomas Trepl <[email protected]>
AuthorDate: Fri May 23 06:59:04 2025 +0200

    Adopt changes in glibc to the m{,x}32 variants
---
 chapter05/glibc.xml | 20 ++++++++++----------
 chapter08/glibc.xml | 24 ++++++++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index d7484f31c..2f9021027 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -129,7 +129,7 @@ cd       build</userinput></screen>
       <varlistentry>
         <term><parameter>--disable-nscd</parameter></term>
         <listitem>
-          <para>Do not build the name service cache daemon which is no 
+          <para>Do not build the name service cache daemon which is no
           longer used.</para>
         </listitem>
       </varlistentry>
@@ -314,7 +314,7 @@ SEARCH_DIR("=/usr/lib");</computeroutput></screen>
 
     <para>Clear the build directory and remove artefacts from
     previous build:</para>
-      
+
 <screen><userinput remap="pre">make clean
 find .. -name "*.a" -delete</userinput></screen>
 
@@ -326,12 +326,12 @@ CXX="$LFS_TGT-g++ -m32" \
       --prefix=/usr                      \
       --host=$LFS_TGT32                  \
       --build=$(../scripts/config.guess) \
-      --enable-kernel=&min-kernel;                \
-      --with-headers=$LFS/usr/include    \
       --disable-nscd                     \
+      --with-headers=$LFS/usr/include    \
       --libdir=/usr/lib32                \
       --libexecdir=/usr/lib32            \
-      libc_cv_slibdir=/usr/lib32</userinput></screen>
+      libc_cv_slibdir=/usr/lib32         \
+      --enable-kernel=&min-kernel;</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -376,7 +376,7 @@ readelf -l a.out | grep '/ld-linux'</userinput></screen>
   <!-- - - - - - - - - - -->
   <!-- Multilib - x32bit -->
   <!-- - - - - - - - - - -->
-  
+
   <sect2 arch="ml_x32,ml_all">
     <title>Building Glibc - x32bit</title>
 
@@ -386,7 +386,7 @@ readelf -l a.out | grep '/ld-linux'</userinput></screen>
 
     <para>Clear the build directory and remove artefacts from
     previous build:</para>
-      
+
 <screen><userinput remap="pre">make clean
 find .. -name "*.a" -delete</userinput></screen>
 
@@ -398,12 +398,12 @@ CXX="$LFS_TGT-g++ -mx32" \
       --prefix=/usr                      \
       --host=$LFS_TGTX32                 \
       --build=$(../scripts/config.guess) \
-      --enable-kernel=&min-kernel;                \
-      --with-headers=$LFS/usr/include    \
       --disable-nscd                     \
+      --with-headers=$LFS/usr/include    \
       --libdir=/usr/libx32               \
       --libexecdir=/usr/libx32           \
-      libc_cv_slibdir=/usr/libx32</userinput></screen>
+      libc_cv_slibdir=/usr/libx32        \
+      --enable-kernel=&min-kernel;</userinput></screen>
 
     <para>Compile the package:</para>
 
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index a957c4bcb..53aa84c90 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -111,7 +111,7 @@ cd       build</userinput></screen>
       <varlistentry>
         <term><parameter>--disable-nscd</parameter></term>
         <listitem>
-          <para>Do not build the name service cache daemon which is no 
+          <para>Do not build the name service cache daemon which is no
           longer used.</para>
         </listitem>
       </varlistentry>
@@ -621,7 +621,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
 
     <para>Clear the build directory and remove artefacts from
     previous build:</para>
-      
+
 <screen><userinput remap="pre">rm -rf ./*
 find .. -name "*.a" -delete</userinput></screen>
 
@@ -632,11 +632,13 @@ find .. -name "*.a" -delete</userinput></screen>
       --prefix=/usr                      \
       --host=i686-pc-linux-gnu           \
       --build=$(../scripts/config.guess) \
-      --enable-kernel=&min-kernel;                \
-      --disable-nscd                     \
       --libdir=/usr/lib32                \
       --libexecdir=/usr/lib32            \
-      libc_cv_slibdir=/usr/lib32</userinput></screen>
+      --disable-werror                   \
+      --disable-nscd                     \
+      libc_cv_slibdir=/usr/lib32         \
+      --enable-stack-protector=strong    \
+      --enable-kernel=&min-kernel;</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -686,7 +688,7 @@ readelf -l a.out | grep '/ld-linux'</userinput></screen>
   <!-- - - - - - - - - - -->
   <!-- Multilib - x32bit -->
   <!-- - - - - - - - - - -->
-  
+
   <sect2 arch="ml_x32,ml_all">
     <title>Building Glibc - x32bit</title>
 
@@ -696,7 +698,7 @@ readelf -l a.out | grep '/ld-linux'</userinput></screen>
 
     <para>Clear the build directory and remove artefacts from
     previous build:</para>
-      
+
 <screen><userinput remap="pre">rm -rf ./*
 find .. -name "*.a" -delete</userinput></screen>
 
@@ -707,11 +709,13 @@ find .. -name "*.a" -delete</userinput></screen>
       --prefix=/usr                      \
       --host=x86_64-pc-linux-gnux32      \
       --build=$(../scripts/config.guess) \
-      --enable-kernel=&min-kernel;                \
-      --disable-nscd                     \
       --libdir=/usr/libx32               \
       --libexecdir=/usr/libx32           \
-      libc_cv_slibdir=/usr/libx32</userinput></screen>
+      --disable-werror                   \
+      --disable-nscd                     \
+      libc_cv_slibdir=/usr/libx32        \
+      --enable-stack-protector=strong    \
+      --enable-kernel=&min-kernel;</userinput></screen>
 
     <para>Compile the package:</para>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.