Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl2/gmake/dist gmake: Apply patch to ...



details:   https://anonhg.NetBSD.org/src/rev/3d84d639590a
branches:  trunk
changeset: 318526:3d84d639590a
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Sat Apr 28 12:20:40 2018 +0000
description:
gmake: Apply patch to support GLIBC glob interface v2

http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116

Fix a build failure on Ubuntu 18.04.

diffstat:

 external/gpl2/gmake/dist/configure    |  3 +--
 external/gpl2/gmake/dist/configure.in |  5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 634e5e202e42 -r 3d84d639590a external/gpl2/gmake/dist/configure
--- a/external/gpl2/gmake/dist/configure        Sat Apr 28 11:49:48 2018 +0000
+++ b/external/gpl2/gmake/dist/configure        Sat Apr 28 12:20:40 2018 +0000
@@ -13619,10 +13619,9 @@
 #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 -r 634e5e202e42 -r 3d84d639590a external/gpl2/gmake/dist/configure.in
--- a/external/gpl2/gmake/dist/configure.in     Sat Apr 28 11:49:48 2018 +0000
+++ b/external/gpl2/gmake/dist/configure.in     Sat Apr 28 12:20:40 2018 +0000
@@ -19,7 +19,7 @@
 AC_INIT([GNU make],[3.81],[bug-make%gnu.org@localhost])
 
 AC_PREREQ(2.59)
-AC_REVISION([[$Id: configure.in,v 1.1.1.1 2014/08/18 06:46:47 christos Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.2 2018/04/28 12:20:40 nonaka Exp $]])
 
 # Autoconf setup
 AC_CONFIG_AUX_DIR(config)
@@ -351,10 +351,9 @@
 #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



Home | Main Index | Thread Index | Old Index