Revert "gcc: Compile without ZSTD"

https://lists.ipfire.org/pipermail/development/2022-February/012544.html

This reverts commit 0b6ba4a0ca2e08cd9fc56e99e80d33a6fe88b395.

diff --git a/lfs/gcc b/lfs/gcc
index 563e94c16bdce8d4098956f27c7997ce8d68e3a9..f78891e24d9a6ac88acf35cea44f3dd0cb3d47fc 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -182,8 +182,7 @@ EXTRA_CONFIG += \
        --disable-multilib \
        --with-bugurl=https://bugzilla.ipfire.org \
        --disable-libunwind-exceptions \
-       --enable-gnu-unique-object \
-       --without-zstd
+       --enable-gnu-unique-object
 
 export XCFLAGS = $(CFLAGS)
 export TCFLAGS = $(CFLAGS)

diff --git a/make.sh b/make.sh
index b6d8153d2923c79c89eca7db75ee9d20a37a5ae4..054827badef231d632ca0f0f759b79306e28967c 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1084,6 +1084,7 @@ buildbase() {
        lfsmake2 tzdata
        lfsmake2 cleanup-toolchain
        lfsmake2 zlib
+       lfsmake2 zstd
        lfsmake2 autoconf
        lfsmake2 automake
        lfsmake2 libtool
@@ -1094,7 +1095,6 @@ buildbase() {
        lfsmake2 libxcrypt
        lfsmake2 file
        lfsmake2 gcc
-       lfsmake2 zstd
        lfsmake2 sed
        lfsmake2 berkeley
        lfsmake2 coreutils