Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=33ea36871455b8447e97621dfc9705a8a7f30452
commit 33ea36871455b8447e97621dfc9705a8a7f30452 Author: crazy <[email protected]> Date: Fri Jan 26 03:55:26 2018 +0100 pacman-g2-3.9.3-2-x86_64 * added -fno-plt patch from git diff --git a/source/base/pacman-g2/0001-makepkg.conf-added-fno-plt-C-CXX-flags.patch b/source/base/pacman-g2/0001-makepkg.conf-added-fno-plt-C-CXX-flags.patch new file mode 100644 index 0000000..90b4dd1 --- /dev/null +++ b/source/base/pacman-g2/0001-makepkg.conf-added-fno-plt-C-CXX-flags.patch @@ -0,0 +1,28 @@ +From 5ce370469af14da0eb180004921c00e73a9aff87 Mon Sep 17 00:00:00 2001 +From: crazy <[email protected]> +Date: Fri, 26 Jan 2018 03:42:40 +0100 +Subject: [PATCH] makepkg.conf: added -fno-plt C/CXX flags + +* I have to many working trees .. +--- + etc/makepkg.conf.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in +index c624e2ca..c0e7f719 100644 +--- a/etc/makepkg.conf.in ++++ b/etc/makepkg.conf.in +@@ -14,8 +14,8 @@ case $(uname -m) in + x86_64) + CARCH="x86_64" + CHOST="x86_64-frugalware-linux" +- CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong" +- CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong" ++ CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" ++ CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" + ;; + esac + export CARCH CHOST CFLAGS CXXFLAGS +-- +2.16.1 + diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index fd3168e..cb747cc 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -9,7 +9,7 @@ USE_MINIMAL=${USE_MINIMAL:-"n"} pkgname=pacman-g2 pkgver=3.9.3 Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053 -pkgrel=1 +pkgrel=2 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) @@ -31,8 +31,8 @@ archs=('x86_64') _F_archive_nosort=y up2date="Flasttar $url/releases/" if ! Fuse $USE_DEVEL; then - source=($url/releases/$pkgname-$pkgver.tar.gz) - signatures=("$source.asc") + source=($url/releases/$pkgname-$pkgver.tar.gz 0001-makepkg.conf-added-fno-plt-C-CXX-flags.patch) + signatures=("$source.asc" '') else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" diff --git a/source/base/pacman-g2/pacman-g2.install b/source/base/pacman-g2/pacman-g2.install index d7af927..0184697 100644 --- a/source/base/pacman-g2/pacman-g2.install +++ b/source/base/pacman-g2/pacman-g2.install @@ -17,7 +17,9 @@ post_upgrade() { sed -i 's/-pipe/-pipe -fstack-protector-strong/g' /etc/makepkg.conf fi - + if ! grep -q "\-fno-plt" /etc/makepkg.conf ; then + sed -i 's/-pipe/-pipe -fno-plt/g' /etc/makepkg.conf + fi } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
