From ff0c88c9e77629c133831ab6accc8d6c32145d95 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sun, 2 May 2021 11:37:36 +0200 Subject: reverted makepkg-x86_64.conf to upstream (devtools) but for zstd flags --ultra -20 --- makepkg-x86_64.conf | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf index c5c0833..6260a0d 100644 --- a/makepkg-x86_64.conf +++ b/makepkg-x86_64.conf @@ -1,4 +1,6 @@ #!/hint/bash +# shellcheck disable=2034 + # # /etc/makepkg.conf # @@ -13,7 +15,7 @@ DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' 'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'rsync::/usr/bin/rsync --no-motd -z %u %o' + 'rsync::/usr/bin/rsync --no-motd -zz %u %o' 'scp::/usr/bin/scp -C %u %o') # Other common tools: @@ -36,20 +38,15 @@ CARCH="x86_64" CHOST="x86_64-pc-linux-gnu" #-- Compiler and Linker Flags -#CPPFLAGS="" -CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \ - -Wp,-D_FORTIFY_SOURCE=2,-D_GLIBCXX_ASSERTIONS \ - -Wformat -Werror=format-security \ - -fstack-clash-protection -fcf-protection" -CXXFLAGS="$CFLAGS" +CPPFLAGS="-D_FORTIFY_SOURCE=2" +CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt" +CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" -#RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" #-- Debugging flags DEBUG_CFLAGS="-g -fvar-tracking-assignments" DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" -#DEBUG_RUSTFLAGS="-C debuginfo=2" ######################################################################### # BUILD ENVIRONMENT @@ -92,7 +89,7 @@ BUILDENV=(!distcc color !ccache check !sign) # OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug) -#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2 +#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) #-- Options to be used when stripping binaries. See `man strip' for details. STRIP_BINARIES="--strip-all" @@ -148,3 +145,5 @@ COMPRESSLZ=(lzip -c -f) # PKGEXT='.pkg.tar.zst' SRCEXT='.src.tar.gz' + +# vim: set ft=sh ts=2 sw=2 et: -- cgit v1.2.3-70-g09d2