From 9d60555f1b02cf3267120f113fb0f27b218e631c Mon Sep 17 00:00:00 2001 From: luiztheblues Date: Fri, 23 Apr 2021 19:01:06 -0300 Subject: [PATCH] Sanitize tar(1) calls and fix a for loop. --- 0-cross-tools/3-GCC-static | 6 +++--- 0-cross-tools/5-GCC-final | 8 ++++---- 0-cross-tools/7-Archive | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/0-cross-tools/3-GCC-static b/0-cross-tools/3-GCC-static index a67ee5f..a42d4dc 100644 --- a/0-cross-tools/3-GCC-static +++ b/0-cross-tools/3-GCC-static @@ -3,11 +3,11 @@ # GCC now requires the GMP, MPFR and MPC packages to build. # Unpack them in-tree. -tar -xf ../pkgs/mpfr-4.1.0.tar.xz +xz -cd ../pkgs/mpfr-4.1.0.tar.xz | tar -xf - mv -v mpfr-4.1.0 mpfr -tar -xf ../pkgs/gmp-6.2.1.tar.xz +xz -cd ../pkgs/gmp-6.2.1.tar.xz | tar -xf - mv -v gmp-6.2.1 gmp -tar -xf ../pkgs/mpc-1.2.1.tar.gz +gunzip -cd ../pkgs/mpc-1.2.1.tar.gz | tar -xf - mv -v mpc-1.2.1 mpc # The GCC documentation recommends building GCC in diff --git a/0-cross-tools/5-GCC-final b/0-cross-tools/5-GCC-final index 9a0b494..bbe1894 100644 --- a/0-cross-tools/5-GCC-final +++ b/0-cross-tools/5-GCC-final @@ -2,15 +2,15 @@ # Build and install as cmlfs # Additional sources to add as GCC requires them -tar -xf ../pkgs/mpfr-4.1.0.tar.xz +xz -cd ../pkgs/mpfr-4.1.0.tar.xz | tar -xf - mv -v mpfr-4.1.0 mpfr -tar -xf ../pkgs/gmp-6.2.1.tar.xz +xz -cd ../pkgs/gmp-6.2.1.tar.xz | tar -xf - mv -v gmp-6.2.1 gmp -tar -xf ../pkgs/mpc-1.2.1.tar.gz +gunzip -cd ../pkgs/mpc-1.2.1.tar.gz | tar -xf - mv -v mpc-1.2.1 mpc # Apply patches [from Alpine-linux] -or p in 0001-posix_memalign.patch \ +for p in 0001-posix_memalign.patch \ 0002-gcc-poison-system-directories.patch \ 0003-Turn-on-Wl-z-relro-z-now-by-default.patch \ 0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch \ diff --git a/0-cross-tools/7-Archive b/0-cross-tools/7-Archive index a51a4a5..dfba02e 100644 --- a/0-cross-tools/7-Archive +++ b/0-cross-tools/7-Archive @@ -7,8 +7,7 @@ # As root, backup the tool-chain for later use cd $CMLFS -tar -Jcf crosstools-gcc-$(uname -m).tar.xz cross-tools +tar -cf - cross-tools | xz -c - > crosstools-gcc-$(uname -m).tar.xz # Do not remove cross-tools at this time. It will # be used to build /cgnutools and /llvmtools -