diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2021-05-02 11:29:07 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2021-05-02 11:29:07 +0200 |
| commit | 37b5c9044393b652063ea71ae004eb3a12085701 (patch) | |
| tree | f2eaadbba6823929b449002c74826a0fa27d9e54 | |
| parent | 984dfc919483b70eee190fa7373ca3c504dea8aa (diff) | |
| download | devtools32-37b5c9044393b652063ea71ae004eb3a12085701.tar.xz | |
synchronized makepkg-x86_64.conf with upstream
fixed sedfu errors in Makefile (architecure and no-CET patches)
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | makepkg-x86_64.conf | 21 |
2 files changed, 13 insertions, 18 deletions
@@ -131,17 +131,11 @@ edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g" makepkg-i486.conf: makepkg-x86_64.conf @echo "GEN $@" - @sed ' \ - s,\(["=]\)x86[-_]64\([-" ]\),\1i486\2,g; \ - s,-fcf-protection,,g; \ - ' "$<" > "$@" + @sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i486\2,g; s,-fcf-protection,,g;' "$<" > "$@" makepkg-i686.conf: makepkg-x86_64.conf @echo "GEN $@" - @sed ' - s,\(["=]\)x86[-_]64\([-" ]\),\1i686\2,g; \ - s,-fcf-protection,,g; \ - ' "$<" > "$@" + @sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i686\2,g; s,-fcf-protection,,g; ' "$<" > "$@" makepkg-pentium4.conf: makepkg-i686.conf @echo "GEN $@" diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf index 3a1384f..c5c0833 100644 --- a/makepkg-x86_64.conf +++ b/makepkg-x86_64.conf @@ -1,6 +1,4 @@ #!/hint/bash -# shellcheck disable=2034 - # # /etc/makepkg.conf # @@ -15,7 +13,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 -zz %u %o' + 'rsync::/usr/bin/rsync --no-motd -z %u %o' 'scp::/usr/bin/scp -C %u %o') # Other common tools: @@ -38,15 +36,20 @@ CARCH="x86_64" CHOST="x86_64-pc-linux-gnu" #-- Compiler and Linker Flags -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" +#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" 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 @@ -89,7 +92,7 @@ BUILDENV=(!distcc color !ccache check !sign) # OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug) -#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 +#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2 INTEGRITY_CHECK=(md5) #-- Options to be used when stripping binaries. See `man strip' for details. STRIP_BINARIES="--strip-all" @@ -132,7 +135,7 @@ DBGSRCDIR="/usr/src/debug" COMPRESSGZ=(gzip -c -f -n) COMPRESSBZ2=(bzip2 -c -f) COMPRESSXZ=(xz -c -z -) -COMPRESSZST=(zstd -c -T0 --ultra -20 -) +COMPRESSZST=(zstd -c -z -q -) COMPRESSLRZ=(lrzip -q) COMPRESSLZO=(lzop -q) COMPRESSZ=(compress -c -f) @@ -145,5 +148,3 @@ COMPRESSLZ=(lzip -c -f) # PKGEXT='.pkg.tar.zst' SRCEXT='.src.tar.gz' - -# vim: set ft=sh ts=2 sw=2 et: |