From 81e0da1028255f703029169ec50bcea23c9622c0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 12 Feb 2018 00:00:29 -0800 Subject: make: Do not assume glibc glob internals glibc 2.27 hides them Signed-off-by: Khem Raj Signed-off-by: Ross Burton --- ...2-glob-Do-not-assume-glibc-glob-internals.patch | 36 ++++++++++++++++++++++ recipes-devtools/make/make_3.81.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 recipes-devtools/make/make-3.81/0002-glob-Do-not-assume-glibc-glob-internals.patch diff --git a/recipes-devtools/make/make-3.81/0002-glob-Do-not-assume-glibc-glob-internals.patch b/recipes-devtools/make/make-3.81/0002-glob-Do-not-assume-glibc-glob-internals.patch new file mode 100644 index 0000000..755be0b --- /dev/null +++ b/recipes-devtools/make/make-3.81/0002-glob-Do-not-assume-glibc-glob-internals.patch @@ -0,0 +1,36 @@ +From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sun, 24 Sep 2017 09:12:58 -0400 +Subject: [PATCH 2/2] 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. +--- +Upstream-Status: Backport +which is so small that it's effectively public domain. + + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: make-3.81/configure.in +=================================================================== +--- make-3.81.orig/configure.in ++++ make-3.81/configure.in +@@ -348,10 +348,9 @@ AC_CACHE_VAL(make_cv_sys_gnu_glob, [ + #include + #include + +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include +-# 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/recipes-devtools/make/make_3.81.bb b/recipes-devtools/make/make_3.81.bb index b8a79b0..9fe22a8 100644 --- a/recipes-devtools/make/make_3.81.bb +++ b/recipes-devtools/make/make_3.81.bb @@ -9,6 +9,7 @@ require make.inc SRC_URI += "file://make_fix_for_automake-1.12.patch" SRC_URI += "file://makeinfo.patch" +SRC_URI += "file://0002-glob-Do-not-assume-glibc-glob-internals.patch" SRC_URI[md5sum] = "354853e0b2da90c527e35aabb8d6f1e6" SRC_URI[sha256sum] = "f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8" -- cgit v1.2.3-54-g00ecf