core140: ship glibc built with new gcc

[ipfire-2.x.git] / lfs / Config

diff --git a/lfs/Config b/lfs/Config
index 42da3f3b1da6b1f453fdd3cb43cc2ae43ae3e2b8..3c552f3f07d39c43c83d231cef7470564fe95682 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -32,6 +32,7 @@
 
 # Cleanup environment from any variables
 unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN TOOLS_DIR
+unexport XZ_OPT
 
 PARALLELISM = $(shell echo $$( \
        if [ -n "$(MAX_PARALLELISM)" ] && [ $(MAX_PARALLELISM) -lt $(DEFAULT_PARALLELISM) ]; then \
@@ -114,6 +115,9 @@ ifeq "$(BUILD_ARCH)" "aarch64"
        GRUB_ARCH = arm64
 endif
 
+# Go
+export GOPATH = $(HOME)/gopath
+
 ###############################################################################
 # Common Macro Definitions
 ###############################################################################
@@ -125,7 +129,7 @@ define FIND_FILES
        cd $(ROOT)/ && find -mount \
                \( -path '.$(TOOLS_DIR)' -or -path './tmp' -or -path './usr/src' \
                -or -path './run' -or -path './dev' -or -path './proc' \
-               -or -path './install' \) -prune -or -print | sort
+               -or -path './install' -or -path '.*/__pycache__' \) -prune -or -print | sort
 endef
 
 # This is common starting logic for builds.
@@ -155,6 +159,7 @@ define POSTBUILD
        @echo "Updating linker cache..."
        @type -p ldconfig >/dev/null && ldconfig || :
        @echo "Install done; saving file list to $(TARGET) ..."
+       @rm -rf $(GOPATH)
        @$(FIND_FILES) > $(DIR_SRC)/lsalrnew
        @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff
        @cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
@@ -240,7 +245,7 @@ define PAK
        sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(BUILD_ARCH)/g' -i /install/packages/package/ROOTFILES
        sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
        chmod 755 /install/packages/package/{{,un}install,update}.sh
-       cd / && tar cfp /install/packages/package/files.tmp --numeric-owner --exclude='#*' --files-from=/install/packages/package/ROOTFILES
+       cd / && tar cfp /install/packages/package/files.tmp --numeric-owner --exclude='#*' --exclude='__pycache__' --files-from=/install/packages/package/ROOTFILES
        # Double tar to remove double files
        tar xfp /install/packages/package/files.tmp --numeric-owner -C /install/packages/package/tmp/
        rm -f /install/packages/package/files.tmp