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

[Konstantin Gizdov]

    Date: Monday, August 10, 2020 @ 12:55:17
  Author: kgizdov
Revision: 673655

upgpkg: remake 4.3+dbg1.5-1

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

-------------------------+
 PKGBUILD                |   19 ++++------
 remake-glibc-2.27.patch |   84 ----------------------------------------------
 2 files changed, 8 insertions(+), 95 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-10 12:47:16 UTC (rev 673654)
+++ PKGBUILD	2020-08-10 12:55:17 UTC (rev 673655)
@@ -2,27 +2,24 @@
 # Based on extra/make
 
 pkgname=remake
-_remakever="dbg-1.4"
-pkgver=4.2.1+dbg1.4
-pkgrel=3
+_remakever="dbg-1.5"
+pkgver=4.3+dbg1.5
+pkgrel=1
 pkgdesc="Enhanced GNU Make - tracing, error reporting, debugging, profiling and more"
 arch=('x86_64')
 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"
-        remake-glibc-2.27.patch)
-sha256sums=('55df3b2586ab90ac0983a049f1911c4a1d9b68f7715c69768fbb0405e96a0e7b'
-            '46ff42675d64d648a91c0b20cee2c2b43286539268aa806b22cdaf2eb7873694')
+source=("https://sourceforge.net/projects/bashdb/files/remake/4.3%2B${_remakever}/remake-4.3%2B${_remakever}.tar.gz")
+sha256sums=('2e6eb709f3e6b85893f14f15e34b4c9b754aceaef0b92bb6ca3a025f10119d76')
 
 prepare() {
-  cd "${pkgname}-4.2.1+${_remakever}"
-  patch -p1 -i ../remake-glibc-2.27.patch # Fix build with glibc 2.27 (Debian)
+  cd "${pkgname}-4.3+${_remakever}"
   autoreconf -fi
 }
 
 build() {
-  cd "${pkgname}-4.2.1+${_remakever}"
+  cd "${pkgname}-4.3+${_remakever}"
   CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
   ./configure --prefix=/usr
   make
@@ -29,7 +26,7 @@
 }
 
 package() {
-  cd "${pkgname}-4.2.1+${_remakever}"
+  cd "${pkgname}-4.3+${_remakever}"
   make DESTDIR="${pkgdir}" install
   rm "$pkgdir"/usr/share/info/make.info{,-1,-2}
 }

Deleted: remake-glibc-2.27.patch
===================================================================
--- remake-glibc-2.27.patch	2020-08-10 12:47:16 UTC (rev 673654)
+++ remake-glibc-2.27.patch	2020-08-10 12:55:17 UTC (rev 673655)
@@ -1,84 +0,0 @@
-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