Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=208f472e7a635c62f1539ff0c751ab51b0dbd50a
commit 208f472e7a635c62f1539ff0c751ab51b0dbd50a
Author: crazy <cr...@frugalware.org>
Date: Sun Feb 4 22:20:27 2018 +0100
pacman-g2-3.9.4-3-x86_64
* put in last fix from git
diff --git a/source/base/pacman-g2/FrugalBuild
b/source/base/pacman-g2/FrugalBuild
index b3cdd4d..c36cb2d 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -7,7 +7,7 @@ USE_MINIMAL=${USE_MINIMAL:-"n"}
pkgname=pacman-g2
pkgver=3.9.4
-pkgrel=2
+pkgrel=3
pkgdesc="A .tar.xz based package manager library (libpacman) and client
(pacman-g2) with dependency support."
url="http://ftp.frugalware.org/pub/other/pacman-g2/";
backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/frugalware-current)
diff --git a/source/base/pacman-g2/git.patch b/source/base/pacman-g2/git.patch
index 4f49edf..eda0811 100644
--- a/source/base/pacman-g2/git.patch
+++ b/source/base/pacman-g2/git.patch
@@ -22,7 +22,7 @@ index 24e0a14a..289f5f00 100644
## -Wl,--as-needed is set from makepkg. Disable with options+=('noasneeded')
diff --git a/scripts/makepkg b/scripts/makepkg
-index d6cde41f..47c473d7 100755
+index d6cde41f..c9ecc3be 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -1240,7 +1240,7 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then
@@ -34,7 +34,25 @@ index d6cde41f..47c473d7 100755
fi
# copy build log to LOGDIR if set
if [ -d "$LOGDIR" ]; then
-@@ -1428,10 +1428,7 @@ if [ "$INCHROOT" == "1" ]; then
+@@ -1420,6 +1420,17 @@ fi
+
+ if [ "$INCHROOT" == "1" ]; then
+
++ ## add before PLT
++ if [ "`check_option NOPROTECTOR`" ]; then
++ warning "Disabling -fstack-protector-strong in C/CXX FLAGS."
++ warning "Do that only with an GOOD reason.."
++ else
++ msg "Enabling -fstack-protector-strong in C/CXX FLAGS"
++ CFLAGS+=" -fstack-protector-strong"
++ CXXFLAGS+=" -fstack-protector-strong"
++ export CFLAGS CXXFLAGS
++ fi
++
+ 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"
+@@ -1428,10 +1439,7 @@ if [ "$INCHROOT" == "1" ]; then
fi
if ! $ECHO $CFLAGS | grep -q "\-fstack-protector-strong" ; then
@@ -46,7 +64,7 @@ index d6cde41f..47c473d7 100755
error "Your build/makepkg.conf is broken"
error "CFLAGS is missing -fstack-protector-strong"
error "and options+=('noprotector') is not set.."
-@@ -1440,12 +1437,9 @@ if [ "$INCHROOT" == "1" ]; then
+@@ -1440,12 +1448,9 @@ if [ "$INCHROOT" == "1" ]; then
fi
if ! $ECHO $CXXFLAGS | grep -q "\-fstack-protector-strong" ; then
@@ -61,20 +79,10 @@ index d6cde41f..47c473d7 100755
error "and options+=('noprotector') is not set.."
exit 1
fi
-@@ -1500,6 +1494,26 @@ if [ "$INCHROOT" == "1" ]; then
+@@ -1500,6 +1505,16 @@ if [ "$INCHROOT" == "1" ]; then
export CFLAGS CXXFLAGS
fi
-+ ## add before PLT
-+ if [ "`check_option NOPROTECTOR`" ]; then
-+ warning "Disabling -fstack-protector-strong in C/CXX FLAGS."
-+ warning "Do that only with an GOOD reason.."
-+ else
-+ msg "Enabling -fstack-protector-strong in C/CXX FLAGS"
-+ CFLAGS+=" -fstack-protector-strong"
-+ CXXFLAGS+=" -fstack-protector-strong"
-+ export CFLAGS CXXFLAGS
-+ fi
+
+ if [ "`check_option PLT`" ]; then
+ warning "Disabling -fno-plt C/CXX FLAGS"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
