From 612f4a843c97f6d59577aa84cb6f08412aa39245 Mon Sep 17 00:00:00 2001
From: Denis Benato <benato.denis96@gmail.com>
Date: Sun, 8 Dec 2024 19:59:27 +0100
Subject: [PATCH] various fixes + acl

---
 build.sh | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 77 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 576d5a9..fb61e0d 100755
--- a/build.sh
+++ b/build.sh
@@ -787,7 +787,7 @@ if [ ! -f "$STEPS_DIR/gawk" ]; then
     "$STRIP" --strip-unneeded "$LFS/bin/gawk"
 
     cd "$BASE_DIR"
-    rm -rf "$STEPS_DIR/gawk"
+    rm -rf "$LFS_BUILD/gawk"
     touch "$STEPS_DIR/gawk"
 fi
 
@@ -913,7 +913,7 @@ if [ ! -f "$STEPS_DIR/patch" ]; then
     cd        build-$LFS_TGT
 
     "../configure"                       \
-        --prefix=$LFS/usr                \
+        --prefix=/usr                    \
         --host=${LFS_TGT}                \
         --build=${BUILD_MACHINE_TRIPLET} \
         --cache-file=config.cache
@@ -988,6 +988,8 @@ if [ ! -f "$STEPS_DIR/tar" ]; then
 
     "$LFS_TGT-strip" --strip-unneeded $LFS/bin/tar
 
+    export LDFLAGS="$LDFLAGS_old"
+
     cd "$BASE_DIR"
     rm -rf "$LFS_BUILD/tar"
     touch "$STEPS_DIR/tar"
@@ -1059,10 +1061,72 @@ if [ ! -f "$STEPS_DIR/gettext" ]; then
     make -j 32 install
 
     cd "$BASE_DIR"
-
+    rm -rf "$LFS_BUILD/gettext"
     touch "$STEPS_DIR/gettext"
 fi
 
+# build xz-utils
+if [ ! -f "$STEPS_DIR/xz" ]; then
+    if [ ! -d "$LFS_BUILD/xz" ]; then
+        tar -xf "$BASE_DIR/sources/xz-5.6.3.tar.xz"
+        mv "xz-5.6.3" "$LFS_BUILD/xz"
+    fi
+    cd "$LFS_BUILD/xz"
+
+    mkdir -vp build-$LFS_TGT
+    cd        build-$LFS_TGT
+
+    "../configure"                       \
+        --prefix=/usr                    \
+        --host=${LFS_TGT}                \
+        --build=${BUILD_MACHINE_TRIPLET} \
+        --disable-static                 \
+        --cache-file=config.cache
+
+    make -j 32
+    make -j 32 DESTDIR=$LFS install
+
+    # Remove the libtool archive file because it is harmful for cross compilation
+    #rm -v $LFS/usr/lib/liblzma.la
+
+    cd "$BASE_DIR"
+    rm -rf "$LFS_BUILD/xz"
+    touch "$STEPS_DIR/xz"
+fi
+
+# build acl
+if [ ! -f "$STEPS_DIR/acl" ]; then
+    if [ ! -d "$LFS_BUILD/acl" ]; then
+        tar -xf "$BASE_DIR/sources/acl-2.3.2.tar.xz"
+        mv "acl-2.3.2" "$LFS_BUILD/acl"
+    fi
+    cd "$LFS_BUILD/acl"
+
+    mkdir -vp build-$LFS_TGT
+    cd        build-$LFS_TGT
+
+    "../configure"                       \
+        --prefix=/usr                    \
+        --host=${LFS_TGT}                \
+        --build=${BUILD_MACHINE_TRIPLET} \
+        --with-sysroot=$LFS              \
+        --disable-static                 \
+        --cache-file=config.cache
+
+    make -j 32
+    make -j 32 DESTDIR=$LFS install
+
+    # Remove the libtool archive file because it is harmful for cross compilation
+    #rm -v $LFS/usr/lib/liblzma.la
+
+    cd "$BASE_DIR"
+    rm -rf "$LFS_BUILD/acl"
+    touch "$STEPS_DIR/acl"
+fi
+
+# Postpone texinfo
+exit 0
+
 # build texinfo
 if [ ! -f "$STEPS_DIR/texinfo" ]; then
     if [ ! -d "$LFS_BUILD/texinfo" ]; then
@@ -1074,6 +1138,14 @@ if [ ! -f "$STEPS_DIR/texinfo" ]; then
     mkdir -vp build-$LFS_TGT
     cd        build-$LFS_TGT
 
+#    cat > config.cache << EOF
+#gl_replace_getopt=no
+#am_func_iconv=no
+#ac_cv_func_calloc_0_nonnull=no
+#gl_cv_func_getopt_posix=no
+#ac_fn_c_try_run=no
+#EOF
+
     PERL=/usr/bin/perl                   \
     "../configure"                       \
         --prefix=$LFS                    \
@@ -1082,10 +1154,10 @@ if [ ! -f "$STEPS_DIR/texinfo" ]; then
         --cache-file=config.cache
 
     #make -j 32
-    make -j 32 DESTDIR="$LFS" install
+    #make -j 32 DESTDIR="$LFS" install
 
     cd "$BASE_DIR"
-
+    rm -rf "$LFS_BUILD/texinfo"
     touch "$STEPS_DIR/texinfo"
 fi