Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From 7b2a0cdc281d94a5782c37ef87040c341447b4b4 Mon Sep 17 00:00:00 2001 |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 3 | Date: Fri, 30 Apr 2021 10:35:02 +0100 |
| 4 | Subject: [PATCH] libxcrypt: Update to 4.4.19 release and fix symbol version |
| 5 | |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 6 | If you pass CFLAGS with a leading space, " " gets passed to popen and convinces |
| 7 | gcc to try and open a file called " ". This results in a confusing error message |
| 8 | like: |
| 9 | |
| 10 | x86_64-pokysdk-linux-gcc: error: : No such file or directory |
| 11 | |
| 12 | Avoid this by stripping empty elements out of CFLAGS. |
| 13 | |
| 14 | Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126] |
| 15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 16 | |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 17 | --- |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 18 | build-aux/scripts/compute-symver-floor | 2 ++ |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 19 | 1 file changed, 2 insertions(+) |
| 20 | |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 21 | diff --git a/build-aux/scripts/compute-symver-floor b/build-aux/scripts/compute-symver-floor |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 22 | index 4ec82e1..8117342 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 23 | --- a/build-aux/scripts/compute-symver-floor |
| 24 | +++ b/build-aux/scripts/compute-symver-floor |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 25 | @@ -36,6 +36,8 @@ sub preprocessor_check { |
| 26 | die "C compiler not available\n" unless @CC; |
| 27 | |
| 28 | @CFLAGS = sh_split($ENV{CFLAGS} // q{}); |
| 29 | + # Remove empty elements, particularly leading ones which cause issues with popen below |
| 30 | + @CFLAGS = grep {$_} @CFLAGS; |
| 31 | |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 32 | # Remove empty elements, particularly leading ones which |
| 33 | # cause issues with popen below. |