Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=807150c4cc958d1f42d8c8f5679a5b052f9b21bb

commit 807150c4cc958d1f42d8c8f5679a5b052f9b21bb
Author: crazy <[email protected]>
Date:   Mon Jun 20 13:44:07 2016 +0200

pacman-g2-3.9.2-3-x86_64
* add patch from git for the grep issues

diff --git 
a/source/base/pacman-g2/0001-makepkg-workaround-some-grep-issues.patch 
b/source/base/pacman-g2/0001-makepkg-workaround-some-grep-issues.patch
new file mode 100644
index 0000000..039571e
--- /dev/null
+++ b/source/base/pacman-g2/0001-makepkg-workaround-some-grep-issues.patch
@@ -0,0 +1,34 @@
+From 8d20cd4461c92855686bc3ca8822e92fdee31d87 Mon Sep 17 00:00:00 2001
+From: crazy <[email protected]>
+Date: Mon, 20 Jun 2016 13:35:05 +0200
+Subject: [PATCH] makepkg - workaround some grep issues
+
+---
+ scripts/makepkg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/makepkg b/scripts/makepkg
+index 030e668..f3c1ba3 100755
+--- a/scripts/makepkg
++++ b/scripts/makepkg
+@@ -1114,7 +1114,7 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then
+               # copy these before any update since without them we can't even 
reach the servers
+               cp -pf /etc/{resolv.conf,services} $CHROOTDIR/etc
+               # run pacman-g2 -Su twice in case pacman-g2 updated
+-              yes "" | /usr/sbin/chroot "$CHROOTDIR" $PACMAN -Sy pacman-g2 
--ask 94 && \
++              yes "" 2>/dev/null | /usr/sbin/chroot "$CHROOTDIR" $PACMAN -Sy 
pacman-g2 --ask 94 && \
+                       /usr/sbin/chroot "$CHROOTDIR" $PACMAN -Su --noconfirm
+               if [ "$?" != "0" ]; then
+                       error "Failed to update chroot environment."
+@@ -1213,7 +1213,7 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then
+               chroot_clean
+               # check optimization and write it to $BUILDSCRIPT
+               msg "Checking for optimization..."
+-              if cat "${BUILDLOG}" | grep -v HOST_ | grep -q -- 
"\($CFLAGS\|$CXXFLAGS\)" ; then
++              if grep -v "HOST_"  "${BUILDLOG}"  2>/dev/null | grep -E  -q  
"(${CFLAGS}|${CXXFLAGS})" ; then
+                       if ! grep -q "# optimization" "${BUILDSCRIPT}" ; then
+                               $ECHO -e "\n# optimization OK" >> 
"${BUILDSCRIPT}"
+                       fi
+--
+2.9.0
+
diff --git a/source/base/pacman-g2/FrugalBuild 
b/source/base/pacman-g2/FrugalBuild
index 07845c9..7008321 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -10,7 +10,7 @@ USE_STABLE=${USE_STABLE:-"n"}
pkgname=pacman-g2
pkgver=3.9.2
Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053
-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,frugalware-current})
@@ -38,8 +38,9 @@ archs=('i686' 'x86_64' 'arm')
_F_archive_nosort=y
up2date="Flasttar $url/releases/"
if ! Fuse $USE_DEVEL; then
-       source=($url/releases/$pkgname-$pkgver.tar.gz 
makepkg-tell-what-dirs-files-are-broken.patch)
-       signatures=("$source.asc" '')
+       source=($url/releases/$pkgname-$pkgver.tar.gz 
makepkg-tell-what-dirs-files-are-broken.patch \
+               0001-makepkg-workaround-some-grep-issues.patch)
+       signatures=("$source.asc" '' '')
if Fuse $USE_STABLE; then
source=("${source[@]}" stable.patch)
signatures=("${signatures[@]}" '')
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to