Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sanitize tar(1) calls and fix a for loop. #5

Merged
merged 1 commit into from
Apr 24, 2021
Merged

Sanitize tar(1) calls and fix a for loop. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions 0-cross-tools/3-GCC-static
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions 0-cross-tools/5-GCC-final
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions 0-cross-tools/7-Archive
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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