[packages/make] - rel 3; fixes from fc
arekm
arekm at pld-linux.org
Sat Mar 9 19:16:21 CET 2019
commit 9ec9d0b13d0fd250a426468f9912461d50ea8333
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Mar 9 19:16:10 2019 +0100
- rel 3; fixes from fc
...ure.ac-SV-50648-Detect-Guile-2.2-packages.patch | 55 ++++++++++++++++++
make-4.2.1-glob-fix-2.patch | 67 ++++++++++++++++++++++
make-4.2.1-glob-fix-3.patch | 15 +++++
make-4.2.1-glob-fix.patch | 28 +++++++++
make.spec | 10 +++-
5 files changed, 174 insertions(+), 1 deletion(-)
---
diff --git a/make.spec b/make.spec
index b8b479a..3866935 100644
--- a/make.spec
+++ b/make.spec
@@ -13,7 +13,7 @@ Summary(tr.UTF-8): GNU Make
Summary(uk.UTF-8): GNU Make
Name: make
Version: 4.2.1
-Release: 2
+Release: 3
Epoch: 1
License: GPL v3+
Group: Development/Building
@@ -22,6 +22,10 @@ Source0: http://ftp.gnu.org/gnu/make/%{name}-%{version}.tar.bz2
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: ab6da7a1ba3bcf9e86e4e3fdecca61a7
Patch0: %{name}-info.patch
+Patch1: 0001-configure.ac-SV-50648-Detect-Guile-2.2-packages.patch
+Patch2: make-4.2.1-glob-fix.patch
+Patch3: make-4.2.1-glob-fix-2.patch
+Patch4: make-4.2.1-glob-fix-3.patch
URL: http://www.gnu.org/software/make/
BuildRequires: autoconf >= 2.62
BuildRequires: automake >= 1:1.11.1
@@ -108,6 +112,10 @@ Plik nagłówkowy interfejsu modułów GNU Make'a.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
%{__gettextize}
diff --git a/0001-configure.ac-SV-50648-Detect-Guile-2.2-packages.patch b/0001-configure.ac-SV-50648-Detect-Guile-2.2-packages.patch
new file mode 100644
index 0000000..ee59553
--- /dev/null
+++ b/0001-configure.ac-SV-50648-Detect-Guile-2.2-packages.patch
@@ -0,0 +1,55 @@
+From fbf71ec25a5986d9003ac16ee9e23675feac9053 Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith at gnu.org>
+Date: Sun, 16 Apr 2017 15:03:48 -0400
+Subject: [PATCH] * configure.ac: [SV 50648] Detect Guile 2.2 packages.
+
+---
+ configure.ac | 26 ++++++++++++++++----------
+ 1 file changed, 16 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1187ad4..a78fb93 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -160,22 +160,28 @@ AC_FUNC_ALLOCA
+ AC_FUNC_CLOSEDIR_VOID
+
+ # See if the user wants to add (or not) GNU Guile support
+-PKG_PROG_PKG_CONFIG
+ AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile],
+ [Support GNU Guile for embedded scripting])])
+
+-# For some strange reason, at least on Ubuntu, each version of Guile
+-# comes with it's own PC file so we have to specify them as individual
+-# packages. Ugh.
++# Annoyingly, each version of Guile comes with it's own PC file so we have to
++# specify them as individual packages. Ugh.
++PKG_PROG_PKG_CONFIG
++
+ 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],
+- [have_guile=no])])
++[ guile_versions="2.2 2.0 1.8"
++ guile_version=no
++ have_guile=no
++ AC_MSG_CHECKING([for GNU Guile])
++ for v in $guile_versions; do
++ PKG_CHECK_EXISTS([guile-$v], [guile_version=$v; have_guile=yes; break], [])
++ done
++ AC_MSG_RESULT([$guile_version])
++ if test "$have_guile" = yes; then
++ PKG_CHECK_MODULES(GUILE, [guile-$guile_version])
++ AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])
++ fi
+ ])
+
+-AS_IF([test "$have_guile" = yes],
+- [AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])])
+-
+ AM_CONDITIONAL([HAVE_GUILE], [test "$have_guile" = yes])
+
+ AC_FUNC_GETLOADAVG
+--
+2.21.0.rc1
+
diff --git a/make-4.2.1-glob-fix-2.patch b/make-4.2.1-glob-fix-2.patch
new file mode 100644
index 0000000..911e315
--- /dev/null
+++ b/make-4.2.1-glob-fix-2.patch
@@ -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
+
diff --git a/make-4.2.1-glob-fix-3.patch b/make-4.2.1-glob-fix-3.patch
new file mode 100644
index 0000000..879fe50
--- /dev/null
+++ b/make-4.2.1-glob-fix-3.patch
@@ -0,0 +1,15 @@
+diff -Nrup a/configure b/configure
+--- a/configure 2018-03-18 23:53:43.991741060 -0400
++++ b/configure 2018-03-18 23:52:52.456028175 -0400
+@@ -11481,10 +11481,9 @@ else
+ #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
diff --git a/make-4.2.1-glob-fix.patch b/make-4.2.1-glob-fix.patch
new file mode 100644
index 0000000..be3abae
--- /dev/null
+++ b/make-4.2.1-glob-fix.patch
@@ -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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/make.git/commitdiff/9ec9d0b13d0fd250a426468f9912461d50ea8333
More information about the pld-cvs-commit
mailing list