Merge pull request #3242 from lazka/default-stack-protector-strong

makepkg: add -fstack-protector-strong to default CFLAGS
This commit is contained in:
Christoph Reiter 2022-10-22 11:36:11 +02:00 committed by GitHub
commit 466177a2bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View File

@ -4,7 +4,7 @@
pkgname=pacman
pkgver=6.0.1
pkgrel=22
pkgrel=23
pkgdesc="A library-based package manager with dependency support (MSYS2 port)"
arch=('i686' 'x86_64')
url="https://www.archlinux.org/pacman/"
@ -70,7 +70,7 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@a
sha256sums=('SKIP'
'26d141ead0b586e29ab6c49ffa45cf60eb2689f53f8e90c885ccd6d117e9ab67'
'c12da01ede663a4924d0817a0d1bd6082b1380383cfb74cc1cea08f9d73e4902'
'73a718e81a1556ddd8a0ee93fbe3f85b3fcdbd9fd574f7deb99bccf0833143b2'
'0409c769b799085f066425c7fe2b4215a3b78d4be5630b4687a026a17f591ae5'
'98198e1f0f252eae0560d271bee4b9149e127399dd0d3fd5d8d24579d9e0550f'
'04ac67a8f458a9daea532f87cedbab76f028ccf437069e3d24a583457603e61d'
'6904ea154e451115c14246ded57737a5ab6c1151d1ac818c37dc849b70a5275f'

View File

@ -42,7 +42,7 @@ if [[ "$MSYSTEM" == "MINGW64" ]]; then
CC="gcc"
CXX="g++"
CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2"
CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
CXXFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe"
LDFLAGS="-pipe"
elif [[ "$MSYSTEM" == "MINGW32" ]]; then
@ -54,7 +54,7 @@ elif [[ "$MSYSTEM" == "MINGW32" ]]; then
CC="gcc"
CXX="g++"
CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2"
CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
CXXFLAGS="-march=pentium4 -mtune=generic -O2 -pipe"
LDFLAGS="-pipe -Wl,--no-seh"
elif [[ "$MSYSTEM" == "CLANG64" ]]; then
@ -66,7 +66,7 @@ elif [[ "$MSYSTEM" == "CLANG64" ]]; then
CC="clang"
CXX="clang++"
CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2"
CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
CXXFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe"
LDFLAGS="-pipe"
elif [[ "$MSYSTEM" == "CLANG32" ]]; then
@ -78,7 +78,7 @@ elif [[ "$MSYSTEM" == "CLANG32" ]]; then
CC="clang"
CXX="clang++"
CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2"
CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
CXXFLAGS="-march=pentium4 -mtune=generic -O2 -pipe"
LDFLAGS="-pipe -Wl,--no-seh"
elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then
@ -90,7 +90,7 @@ elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then
CC="clang"
CXX="clang++"
CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
CFLAGS="-O2 -pipe -Wp,-D_FORTIFY_SOURCE=2"
CFLAGS="-O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
CXXFLAGS="-O2 -pipe"
LDFLAGS="-pipe"
elif [[ "$MSYSTEM" == "UCRT64" ]]; then
@ -102,7 +102,7 @@ elif [[ "$MSYSTEM" == "UCRT64" ]]; then
CC="gcc"
CXX="g++"
CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2"
CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
CXXFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe"
LDFLAGS="-pipe"
else