Module Name: src
Committed By: nonaka
Date: Tue May 1 00:39:58 UTC 2018
Modified Files:
src/external/gpl2/gmake/dist: configure configure.in
Log Message:
gmake: Revert configure r1.2 and configure.in r1.2.
> 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.
Don't apply an imcompatible license patch.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 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.2 src/external/gpl2/gmake/dist/configure:1.3
--- src/external/gpl2/gmake/dist/configure:1.2 Sat Apr 28 12:20:40 2018
+++ src/external/gpl2/gmake/dist/configure Tue May 1 00:39:58 2018
@@ -13619,9 +13619,10 @@ 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 == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
gnu glob
# endif
#endif
Index: src/external/gpl2/gmake/dist/configure.in
diff -u src/external/gpl2/gmake/dist/configure.in:1.2 src/external/gpl2/gmake/dist/configure.in:1.3
--- src/external/gpl2/gmake/dist/configure.in:1.2 Sat Apr 28 12:20:40 2018
+++ src/external/gpl2/gmake/dist/configure.in Tue May 1 00:39:58 2018
@@ -19,7 +19,7 @@
AC_INIT([GNU make],[3.81],[bug-m...@gnu.org])
AC_PREREQ(2.59)
-AC_REVISION([[$Id: configure.in,v 1.2 2018/04/28 12:20:40 nonaka Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.3 2018/05/01 00:39:58 nonaka Exp $]])
# Autoconf setup
AC_CONFIG_AUX_DIR(config)
@@ -351,9 +351,10 @@ 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 == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
gnu glob
# endif
#endif
