Module Name: src
Committed By: nonaka
Date: Sat Apr 28 12:20:41 UTC 2018
Modified Files:
src/external/gpl2/gmake/dist: configure configure.in
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/configure \
src/external/gpl2/gmake/dist/configure.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/gmake/dist/configure
diff -u src/external/gpl2/gmake/dist/configure:1.1.1.1 src/external/gpl2/gmake/dist/configure:1.2
--- src/external/gpl2/gmake/dist/configure:1.1.1.1 Mon Aug 18 06:46:54 2014
+++ src/external/gpl2/gmake/dist/configure Sat Apr 28 12:20:40 2018
@@ -13619,10 +13619,9 @@ cat >>conftest.$ac_ext <<_ACEOF
#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
Index: src/external/gpl2/gmake/dist/configure.in
diff -u src/external/gpl2/gmake/dist/configure.in:1.1.1.1 src/external/gpl2/gmake/dist/configure.in:1.2
--- src/external/gpl2/gmake/dist/configure.in:1.1.1.1 Mon Aug 18 06:46:47 2014
+++ src/external/gpl2/gmake/dist/configure.in Sat Apr 28 12:20:40 2018
@@ -19,7 +19,7 @@
AC_INIT([GNU make],[3.81],[[email protected]])
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 @@ AC_CACHE_VAL(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
