diff options
-rw-r--r-- | devel/gmake/distinfo | 4 | ||||
-rw-r--r-- | devel/gmake/patches/patch-configure | 20 | ||||
-rw-r--r-- | devel/gmake/patches/patch-configure.ac | 20 |
3 files changed, 43 insertions, 1 deletions
diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo index a99bc4284a0..e11c8154b82 100644 --- a/devel/gmake/distinfo +++ b/devel/gmake/distinfo @@ -1,10 +1,12 @@ -$NetBSD: distinfo,v 1.32 2016/12/17 14:14:06 joerg Exp $ +$NetBSD: distinfo,v 1.33 2018/04/28 06:59:41 minskim Exp $ SHA1 (make-4.1.tar.bz2) = 0d701882fd6fd61a9652cb8d866ad7fc7de54d58 RMD160 (make-4.1.tar.bz2) = 0f322d6c28867ea817f7d02c57e635c8ef556909 SHA512 (make-4.1.tar.bz2) = 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193 Size (make-4.1.tar.bz2) = 1327342 bytes SHA1 (patch-af) = 8ff060ecba9d664044eabd98741253881d8c9bbe +SHA1 (patch-configure) = e3122c5c1bbe59ec4c233f42feb6d7952a1e1215 +SHA1 (patch-configure.ac) = 7d22c8f5e5d349687885f55120fa2f7c1251e399 SHA1 (patch-main.c) = 6674cc95ce702c06b8214963bcb43bde3919be4f SHA1 (patch-makeint.h) = d4508002620ca35d2661c1b6f8ae0ed3b4771fb1 SHA1 (patch-pa) = 2c0168db7afec3da98b30392290e5b9464ea7b5e diff --git a/devel/gmake/patches/patch-configure b/devel/gmake/patches/patch-configure new file mode 100644 index 00000000000..f08e92f3f3d --- /dev/null +++ b/devel/gmake/patches/patch-configure @@ -0,0 +1,20 @@ +$NetBSD: patch-configure,v 1.1 2018/04/28 06:59:41 minskim Exp $ + +Support GLIBC glob interface version 2. + +http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116 + +--- configure.orig 2014-10-05 16:25:21.000000000 +0000 ++++ configure +@@ -11060,10 +11060,9 @@ else + #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/devel/gmake/patches/patch-configure.ac b/devel/gmake/patches/patch-configure.ac new file mode 100644 index 00000000000..b2b8f038a96 --- /dev/null +++ b/devel/gmake/patches/patch-configure.ac @@ -0,0 +1,20 @@ +$NetBSD: patch-configure.ac,v 1.1 2018/04/28 06:59:41 minskim Exp $ + +Support GLIBC glob interface version 2. + +http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116 + +--- configure.ac.orig 2014-10-05 16:24:51.000000000 +0000 ++++ configure.ac +@@ -401,10 +401,9 @@ AC_CACHE_CHECK([if system libc has GNU g + #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], |