[arch-commits] Commit in make/trunk (PKGBUILD make-3.82-sort-blank.patch)

[Allan McRae]

    Date: Friday, February 18, 2011 @ 17:21:30
  Author: allan
Revision: 110342

upgpkg: make 3.82-3
fix andriod build crash - FS#22733

Added:
  make/trunk/make-3.82-sort-blank.patch
Modified:
  make/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   11 ++++++++---
 make-3.82-sort-blank.patch |   17 +++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2011-02-18 21:14:40 UTC (rev 110341)
+++ PKGBUILD    2011-02-18 22:21:30 UTC (rev 110342)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=3.82
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make";
@@ -14,10 +14,12 @@
 install=$pkgname.install
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         bug30612.patch
-        bug30723.patch)
+        bug30723.patch
+        make-3.82-sort-blank.patch)
 md5sums=('1a11100f3c63fcf5753818e59d63088f'
          'c8f496b22191f9fb9420ab14c1a19a47'
-         '662e6450e19a5acdaa5c9fcb8ad78dea')
+         '662e6450e19a5acdaa5c9fcb8ad78dea'
+         '7d01a99f389d8f08dec93ed479071ee4')
 
 
 build() {
@@ -29,6 +31,9 @@
   # http://savannah.gnu.org/bugs/?30723
   patch -Np1 -i $srcdir/bug30723.patch
   
+  # https://bugs.archlinux.org/task/22733 (fix from Fedora)
+  patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
+  
   ./configure --prefix=/usr
   make
   make check

Added: make-3.82-sort-blank.patch
===================================================================
--- make-3.82-sort-blank.patch                          (rev 0)
+++ make-3.82-sort-blank.patch  2011-02-18 22:21:30 UTC (rev 110342)
@@ -0,0 +1,17 @@
+diff -urp make-3.82/function.c make-3.82-pm/function.c
+--- make-3.82/function.c       2010-07-13 03:20:39.000000000 +0200
++++ make-3.82-pm/function.c    2010-10-27 01:43:27.000000000 +0200
+@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c
+     {
+       char c = *(t++);
+ 
+-      if (! isspace ((unsigned char)c))
++      if (! isblank ((unsigned char)c))
+         continue;
+ 
+       ++wordi;
+ 
+-      while (isspace ((unsigned char)*t))
++      while (isblank ((unsigned char)*t))
+         ++t;
+     }