Date: Monday, February 3, 2020 @ 08:39:29 Author: lfleischer Revision: 374520
upgpkg: make 4.3-1: upstream update Modified: make/trunk/PKGBUILD Deleted: make/trunk/guile-2.2.patch 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 ------------------------------+ PKGBUILD | 34 +++----------------- guile-2.2.patch | 15 --------- make-4.2.1-glob1.patch | 67 ----------------------------------------- make-4.2.1-glob2.patch | 28 ----------------- make-4.2.1-test-driver.patch | 19 ----------- 5 files changed, 6 insertions(+), 157 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-02-03 00:11:19 UTC (rev 374519) +++ PKGBUILD 2020-02-03 08:39:29 UTC (rev 374520) @@ -3,8 +3,8 @@ # Contributor: judd <[email protected]> pkgname=make -pkgver=4.2.1 -pkgrel=4 +pkgver=4.3 +pkgrel=1 pkgdesc="GNU make utility to maintain groups of programs" arch=('x86_64') url="https://www.gnu.org/software/make"; @@ -11,33 +11,11 @@ license=('GPL3') groups=('base-devel') depends=('glibc' 'guile') -source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - 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' - '05a3b10e0da01d84cd078905a11437ed' - '6f5dbcb368728582b34bac197f0d3197' - 'af63eff24206e1fa06af64b8ec7b07b9') -validpgpkeys=('3D2554F0A15338AB9AF1BB9D96B047156338B6D4') # Paul Smith +source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.lz"{,.sig}) +md5sums=('d5c40e7bd1e97a7404f5d3be982f479a' + 'SKIP') +validpgpkeys=('6D4EEB02AD834703510B117680CB727A20C79BB2') # 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 -} - build() { cd "${pkgname}-${pkgver}" ./configure --prefix=/usr Deleted: guile-2.2.patch =================================================================== --- guile-2.2.patch 2020-02-03 00:11:19 UTC (rev 374519) +++ guile-2.2.patch 2020-02-03 08:39:29 UTC (rev 374520) @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 64ec870..eb1139f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -168,8 +168,8 @@ AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile], - # comes with it's own PC file so we have to specify them as individual - # packages. Ugh. - AS_IF([test "x$with_guile" != xno], --[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes], -- [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes], -+[ PKG_CHECK_MODULES([GUILE], [guile-2.2], [have_guile=yes], -+ [PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes], - [have_guile=no])]) - ]) - Deleted: make-4.2.1-glob1.patch =================================================================== --- make-4.2.1-glob1.patch 2020-02-03 00:11:19 UTC (rev 374519) +++ make-4.2.1-glob1.patch 2020-02-03 08:39:29 UTC (rev 374520) @@ -1,67 +0,0 @@ -From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001 -From: Paul Eggert <[email protected]> -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 - Deleted: make-4.2.1-glob2.patch =================================================================== --- make-4.2.1-glob2.patch 2020-02-03 00:11:19 UTC (rev 374519) +++ make-4.2.1-glob2.patch 2020-02-03 08:39:29 UTC (rev 374520) @@ -1,28 +0,0 @@ -From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001 -From: Paul Smith <[email protected]> -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 - Deleted: make-4.2.1-test-driver.patch =================================================================== --- make-4.2.1-test-driver.patch 2020-02-03 00:11:19 UTC (rev 374519) +++ make-4.2.1-test-driver.patch 2020-02-03 08:39:29 UTC (rev 374520) @@ -1,19 +0,0 @@ -commit d9d4e06084a4c7da480bd49a3487aadf6ba77b54 -Author: Enrique Olaizola <[email protected]> -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"; -
