[arch-commits] Commit in remake/trunk (PKGBUILD remake-glibc-2.27.patch)

Antonio Rojas arojas at archlinux.org
Fri Jan 11 14:30:13 UTC 2019


    Date: Friday, January 11, 2019 @ 14:30:12
  Author: arojas
Revision: 422420

Fix build with glibc 2.27

Added:
  remake/trunk/remake-glibc-2.27.patch
Modified:
  remake/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    7 ++-
 remake-glibc-2.27.patch |   84 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-11 14:14:05 UTC (rev 422419)
+++ PKGBUILD	2019-01-11 14:30:12 UTC (rev 422420)
@@ -10,11 +10,14 @@
 url="http://bashdb.sourceforge.net/remake/"
 license=('GPL3')
 depends=('glibc' 'guile')
-source=("https://sourceforge.net/projects/bashdb/files/remake/4.2%2B${_remakever}/remake-4.2.1%2B${_remakever}.tar.bz2")
-sha256sums=('55df3b2586ab90ac0983a049f1911c4a1d9b68f7715c69768fbb0405e96a0e7b')
+source=("https://sourceforge.net/projects/bashdb/files/remake/4.2%2B${_remakever}/remake-4.2.1%2B${_remakever}.tar.bz2"
+        remake-glibc-2.27.patch)
+sha256sums=('55df3b2586ab90ac0983a049f1911c4a1d9b68f7715c69768fbb0405e96a0e7b'
+            '46ff42675d64d648a91c0b20cee2c2b43286539268aa806b22cdaf2eb7873694')
 
 prepare() {
   cd "${pkgname}-4.2.1+${_remakever}"
+  patch -p1 -i ../remake-glibc-2.27.patch # Fix build with glibc 2.27 (Debian)
   autoreconf -fi
 }
 

Added: remake-glibc-2.27.patch
===================================================================
--- remake-glibc-2.27.patch	                        (rev 0)
+++ remake-glibc-2.27.patch	2019-01-11 14:30:12 UTC (rev 422420)
@@ -0,0 +1,84 @@
+commit 48c8a116a914a325a0497721f5d8b58d5bba34d4
+Author: Paul Smith <psmith at gnu.org>
+Date:   Sun Nov 19 15:09:16 2017 -0500
+
+    * configure.ac: Support GLIBC glob interface version 2
+
+commit 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4
+Author: Paul Eggert <eggert at cs.ucla.edu>
+Date:   Sun Sep 24 09:12:58 2017 -0400
+
+    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.
+
+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],
+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


More information about the arch-commits mailing list