diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-10 09:46:27 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-10 09:46:27 +0100 |
| commit | bdf7bc10b3d82910abfc0a91803d493299efb2d3 (patch) | |
| tree | 953964cb4a79764465d79bcd88fcaba027a122ca /core | |
| parent | 4dd22c9bde32070cf501c7aa28d58d633e895834 (diff) | |
| download | packages-bdf7bc10b3d82910abfc0a91803d493299efb2d3.tar.xz | |
core/pacman: upstream dropped "-fstack-protector-strong" from makepkg.conf - we do so, too
Diffstat (limited to 'core')
| -rw-r--r-- | core/pacman/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/pacman/makepkg.conf | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index 86372fc6..ce92903a 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -1,4 +1,4 @@ -# upstream git revision: e06c0338abc7919fe18a2070704bcd498344b29e +# upstream git revision: 2519f7ad3a9ad47ee6bb997d53a2266ca34fdd52 depends+=(archlinux32-keyring) @@ -7,8 +7,8 @@ for ((i=0; i<${#sha256sums[@]}; i++)); do if [ "${sha256sums[${i}]}" = 'b82e9c1073292766c2f49b5c771dddf37383f1151117ef9cd5e0c11047b4f3eb' ]; then sha256sums[${i}]='d75bbbe42d290c4f22a95e6ac86d4723dc6d0c08228d14c3dcbae9dc5d2514e5' fi - if [ "${sha256sums[${i}]}" = '650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e' ]; then - sha256sums[${i}]='d1c3e5f9b7259e401ab121aff335531452d23dc67d9e6c2f464771d25f11058a' + if [ "${sha256sums[${i}]}" = '8442bbb3d1d83f09610e9d687f9121037d97c6acaa06c4e907fc6e9eb0b127ec' ]; then + sha256sums[${i}]='730b6d399dc03ea0ea505fde9387b3fd14475a0e5421e53be30b6b2f946b974f' fi done diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf index b1f1c25d..0b49df35 100644 --- a/core/pacman/makepkg.conf +++ b/core/pacman/makepkg.conf @@ -37,8 +37,8 @@ CHOST="i686-pc-linux-gnu" #-- Compiler and Linker Flags CPPFLAGS="-D_FORTIFY_SOURCE=2" -CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" -CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" +CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt" +CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" |