Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=424a9214f655e79b741c41028b85a6e8a76676a2
commit 424a9214f655e79b741c41028b85a6e8a76676a2 Author: crazy <[email protected]> Date: Tue Jan 30 19:22:42 2018 +0100 fix spelling and old hash-style check diff --git a/scripts/makepkg b/scripts/makepkg index 8facadc..32171e1 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1415,7 +1415,7 @@ fi if [ "$INCHROOT" == "1" ]; then - if ! $ECHO $LDFLAGS | grep -q "\-Wl,--hash-style=both" ; then + if $ECHO $LDFLAGS | grep -q "\-Wl,--hash-style=both" ; then error "You are using -Wl,--hash-style=both" error "LDFLAGS changed to -Wl,--hash-style=gnu" error "Fix your makepkg.conf" @@ -1428,8 +1428,8 @@ if [ "$INCHROOT" == "1" ]; then warning "when you have a very GOOD reason.." else error "Your build/makepkg.conf is broken" - error "-fstack-protector-strong missing in CFLAGS and" - error "options+=('noprotector') is not set.." + error "CFLAGS is missing -fstack-protector-strong" + error "and options+=('noprotector') is not set.." exit 1 fi fi @@ -1440,8 +1440,8 @@ if [ "$INCHROOT" == "1" ]; then warning "when you have a very GOOD reason.." else error "Your build/makepkg.conf is broken" - error "-fstack-protector-strong missing in CFLAGS and" - error "options+=('noprotector') is not set.." + error "CXXFLAGS is missing -fstack-protector-strong missing" + error "and options+=('noprotector') is not set.." ext 1 fi fi _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
