[arch-commits] Commit in make/trunk (4 files)

Allan McRae allan at archlinux.org
Sat Nov 3 23:29:28 UTC 2018


    Date: Saturday, November 3, 2018 @ 23:29:27
  Author: allan
Revision: 337793

upgpkg: make 4.2.1-3

fix FTBFS

Added:
  make/trunk/make-4.2.1-glob1.patch
  make/trunk/make-4.2.1-glob2.patch
  make/trunk/make-4.2.1-test-driver.patch
Modified:
  make/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   20 ++++++++++--
 make-4.2.1-glob1.patch       |   67 +++++++++++++++++++++++++++++++++++++++++
 make-4.2.1-glob2.patch       |   28 +++++++++++++++++
 make-4.2.1-test-driver.patch |   19 +++++++++++
 4 files changed, 131 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-03 23:10:31 UTC (rev 337792)
+++ PKGBUILD	2018-11-03 23:29:27 UTC (rev 337793)
@@ -3,7 +3,7 @@
 
 pkgname=make
 pkgver=4.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('x86_64')
 url="http://www.gnu.org/software/make"
@@ -11,15 +11,29 @@
 groups=('base-devel')
 depends=('glibc' 'guile')
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        guile-2.2.patch)
+        guile-2.2.patch
+        make-4.2.1-glob1.patch
+        make-4.2.1-glob2.patch
+        make-4.2.1-test-driver.patch)
 md5sums=('15b012617e7c44c0ed482721629577ac'
          'SKIP'
-         '89bbbe3f806f208608e117665feb562b')
+         '89bbbe3f806f208608e117665feb562b'
+         '05a3b10e0da01d84cd078905a11437ed'
+         '6f5dbcb368728582b34bac197f0d3197'
+         'af63eff24206e1fa06af64b8ec7b07b9')
 validpgpkeys=('3D2554F0A15338AB9AF1BB9D96B047156338B6D4')   # Paul Smith
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p1 -i ${srcdir}/guile-2.2.patch
+
+  #https://git.savannah.gnu.org/cgit/make.git/patch/?id=193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4
+  patch -p1 -i ${srcdir}/make-4.2.1-glob1.patch
+  #https://git.savannah.gnu.org/cgit/make.git/patch/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4
+  patch -p1 -i ${srcdir}/make-4.2.1-glob2.patch
+
+  patch -p1 -i ${srcdir}/make-4.2.1-test-driver.patch
+
   autoreconf -fi
 }
 

Added: make-4.2.1-glob1.patch
===================================================================
--- make-4.2.1-glob1.patch	                        (rev 0)
+++ make-4.2.1-glob1.patch	2018-11-03 23:29:27 UTC (rev 337793)
@@ -0,0 +1,67 @@
+From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert at cs.ucla.edu>
+Date: Sun, 24 Sep 2017 09:12:58 -0400
+Subject: glob: Do not assume glibc glob internals.
+
+It has been proposed that glibc glob start using gl_lstat,
+which the API allows it to do.  GNU 'make' should not get in
+the way of this.  See:
+https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
+
+* dir.c (local_lstat): New function, like local_stat.
+(dir_setup_glob): Use it to initialize gl_lstat too, as the API
+requires.
+---
+ dir.c | 29 +++++++++++++++++++++++++++--
+ 1 file changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/dir.c b/dir.c
+index adbb8a9..c343e4c 100644
+--- a/dir.c
++++ b/dir.c
+@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
+ }
+ #endif
+ 
++/* Similarly for lstat.  */
++#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
++# ifndef VMS
++#  ifndef HAVE_SYS_STAT_H
++int lstat (const char *path, struct stat *sbuf);
++#  endif
++# else
++    /* We are done with the fake lstat.  Go back to the real lstat */
++#   ifdef lstat
++#     undef lstat
++#   endif
++# endif
++# define local_lstat lstat
++#elif defined(WINDOWS32)
++/* Windows doesn't support lstat().  */
++# define local_lstat local_stat
++#else
++static int
++local_lstat (const char *path, struct stat *buf)
++{
++  int e;
++  EINTRLOOP (e, lstat (path, buf));
++  return e;
++}
++#endif
++
+ void
+ dir_setup_glob (glob_t *gl)
+ {
+   gl->gl_opendir = open_dirstream;
+   gl->gl_readdir = read_dirstream;
+   gl->gl_closedir = free;
++  gl->gl_lstat = local_lstat;
+   gl->gl_stat = local_stat;
+-  /* We don't bother setting gl_lstat, since glob never calls it.
+-     The slot is only there for compatibility with 4.4 BSD.  */
+ }
+ 
+ void
+-- 
+cgit v1.0-41-gc330
+

Added: make-4.2.1-glob2.patch
===================================================================
--- make-4.2.1-glob2.patch	                        (rev 0)
+++ make-4.2.1-glob2.patch	2018-11-03 23:29:27 UTC (rev 337793)
@@ -0,0 +1,28 @@
+From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith at gnu.org>
+Date: Sun, 19 Nov 2017 15:09:16 -0500
+Subject: * configure.ac: Support GLIBC glob interface version 2
+
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c72568..4710832 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob],
+ #include <glob.h>
+ #include <fnmatch.h>
+ 
+-#define GLOB_INTERFACE_VERSION 1
+ #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
+ # include <gnu-versions.h>
+-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+    gnu glob
+ # endif
+ #endif],
+-- 
+cgit v1.0-41-gc330
+

Added: make-4.2.1-test-driver.patch
===================================================================
--- make-4.2.1-test-driver.patch	                        (rev 0)
+++ make-4.2.1-test-driver.patch	2018-11-03 23:29:27 UTC (rev 337793)
@@ -0,0 +1,19 @@
+commit d9d4e06084a4c7da480bd49a3487aadf6ba77b54
+Author: Enrique Olaizola <enrique_olaizola16 at hotmail.com>
+Date:   Sat May 27 14:24:33 2017 -0400
+
+    * tests/run_make_tests.pl: [SV 50902] Find Perl modules
+
+diff -Nrup a/tests/run_make_tests.pl b/tests/run_make_tests.pl
+--- a/tests/run_make_tests.pl	2016-04-04 01:38:37.000000000 -0400
++++ b/tests/run_make_tests.pl	2018-04-25 14:19:19.692178798 -0400
+@@ -58,6 +58,9 @@ if ($^O eq 'VMS')
+   *CORE::GLOBAL::rmdir = \&vms_rmdir;
+ }
+ 
++use FindBin;
++use lib "$FindBin::Bin";
++
+ require "test_driver.pl";
+ require "config-flags.pm";
+ 


More information about the arch-commits mailing list