summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch')
-rw-r--r--meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch21
1 files changed, 15 insertions, 6 deletions
diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
index 5448fe0fa6..94aa3fed49 100644
--- a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
+++ b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
@@ -1,3 +1,8 @@
+From 7b2a0cdc281d94a5782c37ef87040c341447b4b4 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Fri, 30 Apr 2021 10:35:02 +0100
+Subject: [PATCH] libxcrypt: Update to 4.4.19 release and fix symbol version
+
If you pass CFLAGS with a leading space, " " gets passed to popen and convinces
gcc to try and open a file called " ". This results in a confusing error message
like:
@@ -9,10 +14,14 @@ Avoid this by stripping empty elements out of CFLAGS.
Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Index: a/build-aux/compute-symver-floor
-===================================================================
---- a/build-aux/compute-symver-floor
-+++ b/build-aux/compute-symver-floor
+---
+ build-aux/scripts/compute-symver-floor | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/build-aux/scripts/compute-symver-floor b/build-aux/scripts/compute-symver-floor
+index 4ec82e1..8117342 100644
+--- a/build-aux/scripts/compute-symver-floor
++++ b/build-aux/scripts/compute-symver-floor
@@ -36,6 +36,8 @@ sub preprocessor_check {
die "C compiler not available\n" unless @CC;
@@ -20,5 +29,5 @@ Index: a/build-aux/compute-symver-floor
+ # Remove empty elements, particularly leading ones which cause issues with popen below
+ @CFLAGS = grep {$_} @CFLAGS;
- # We call ensure_C_locale here, not from the main section,
- # because this sub might not get called at all, in which
+ # Remove empty elements, particularly leading ones which
+ # cause issues with popen below.