diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-30 10:35:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-30 16:42:25 +0100 |
commit | 19c365d040eb50a52fc7211a2d0aa223c4a6e0f8 (patch) | |
tree | e87f1516d281b5797c84ccb6554c0919630f87fe /meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch | |
parent | c21419b1fee3098298a77efdcca322fa665dea54 (diff) | |
download | poky-19c365d040eb50a52fc7211a2d0aa223c4a6e0f8.tar.gz |
libxcrypt: Update to 4.4.19 release and fix symbol version issues
This patch upgrades to the 4.4.19 release and replaces a configure patch
from "libxcrypt: fix sporadic failures in nativesdk-libxcrypt-compat" with
a fix to avoid leading spaces in CFLAGS causing failures.
The license changed a few filenames listed in the license but the overall
license remains unchanged.
(From OE-Core rev: 7a2144f065c913ef189011b94d90de4dde51a347)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch')
-rw-r--r-- | meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch new file mode 100644 index 0000000000..5448fe0fa6 --- /dev/null +++ b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | If you pass CFLAGS with a leading space, " " gets passed to popen and convinces | ||
2 | gcc to try and open a file called " ". This results in a confusing error message | ||
3 | like: | ||
4 | |||
5 | x86_64-pokysdk-linux-gcc: error: : No such file or directory | ||
6 | |||
7 | Avoid this by stripping empty elements out of CFLAGS. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126] | ||
10 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
11 | |||
12 | Index: a/build-aux/compute-symver-floor | ||
13 | =================================================================== | ||
14 | --- a/build-aux/compute-symver-floor | ||
15 | +++ b/build-aux/compute-symver-floor | ||
16 | @@ -36,6 +36,8 @@ sub preprocessor_check { | ||
17 | die "C compiler not available\n" unless @CC; | ||
18 | |||
19 | @CFLAGS = sh_split($ENV{CFLAGS} // q{}); | ||
20 | + # Remove empty elements, particularly leading ones which cause issues with popen below | ||
21 | + @CFLAGS = grep {$_} @CFLAGS; | ||
22 | |||
23 | # We call ensure_C_locale here, not from the main section, | ||
24 | # because this sub might not get called at all, in which | ||