diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-01-27 10:56:20 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-18 11:09:39 +0100 |
commit | 2832aa209ddbbfc5c5d66f2108be01db27b02a1e (patch) | |
tree | 209f568100590cc586151fe2f3d0d91bd1c526c3 /meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch | |
parent | 076b057c468b097620e71061a4917ce615f52af5 (diff) | |
download | poky-2832aa209ddbbfc5c5d66f2108be01db27b02a1e.tar.gz |
make: Backport fixes to not assume glibc internal glob implementation
Exposed with glibc 2.27
(From OE-Core rev: cdf370f1bd046ba6207b63c9a82bdfff2b261a7d)
(From OE-Core rev: bd81e47c12b8f3bbb8a9e24379b6632e36f11462)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch')
-rw-r--r-- | meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch new file mode 100644 index 0000000000..d49acd9f6e --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggert <eggert@cs.ucla.edu> | ||
3 | Date: Sun, 24 Sep 2017 09:12:58 -0400 | ||
4 | Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. | ||
5 | |||
6 | It has been proposed that glibc glob start using gl_lstat, | ||
7 | which the API allows it to do. GNU 'make' should not get in | ||
8 | the way of this. See: | ||
9 | https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html | ||
10 | |||
11 | * dir.c (local_lstat): New function, like local_stat. | ||
12 | (dir_setup_glob): Use it to initialize gl_lstat too, as the API | ||
13 | requires. | ||
14 | --- | ||
15 | Upstream-Status: Backport | ||
16 | |||
17 | configure.ac | 3 +-- | ||
18 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/configure.ac b/configure.ac | ||
21 | index 64ec870..e87901c 100644 | ||
22 | --- a/configure.ac | ||
23 | +++ b/configure.ac | ||
24 | @@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], | ||
25 | #include <glob.h> | ||
26 | #include <fnmatch.h> | ||
27 | |||
28 | -#define GLOB_INTERFACE_VERSION 1 | ||
29 | #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 | ||
30 | # include <gnu-versions.h> | ||
31 | -# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION | ||
32 | +if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 | ||
33 | gnu glob | ||
34 | # endif | ||
35 | #endif], | ||
36 | -- | ||
37 | 2.16.1 | ||
38 | |||