summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/libxcrypt/files
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-30 10:35:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-30 16:42:25 +0100
commit19c365d040eb50a52fc7211a2d0aa223c4a6e0f8 (patch)
treee87f1516d281b5797c84ccb6554c0919630f87fe /meta/recipes-core/libxcrypt/files
parentc21419b1fee3098298a77efdcca322fa665dea54 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-core/libxcrypt/files/0001-configure.ac-do-not-use-compute-symver-floor.patch32
-rw-r--r--meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch24
2 files changed, 24 insertions, 32 deletions
diff --git a/meta/recipes-core/libxcrypt/files/0001-configure.ac-do-not-use-compute-symver-floor.patch b/meta/recipes-core/libxcrypt/files/0001-configure.ac-do-not-use-compute-symver-floor.patch
deleted file mode 100644
index 4e6b427104..0000000000
--- a/meta/recipes-core/libxcrypt/files/0001-configure.ac-do-not-use-compute-symver-floor.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From b28bb856ccebe8fded51d11362bf5920699eed59 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 18 Mar 2021 10:52:13 +0000
4Subject: [PATCH] configure.ac: do not use compute-symver-floor
5
6This script (newly introduced in 4.4.18) sporadically fails, without
7failing configure(), which has been reported at
8https://github.com/besser82/libxcrypt/issues/123
9
10Upstream-Status: Inappropriate
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 configure.ac | 6 +-----
14 1 file changed, 1 insertion(+), 5 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 45b91b4..f3ba945 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -426,11 +426,7 @@ if test x$enable_shared != xyes; then enable_obsolete_api=0; fi
21 # need to be binary backward compatible with.
22 if test $enable_obsolete_api = 1; then
23 AC_MSG_CHECKING([minimum symbol version to use for compatibility symbols])
24- SYMVER_FLOOR=$(
25- $PERL ${srcdir}/build-aux/compute-symver-floor \
26- ${srcdir}/lib/libcrypt.minver $host_os $host_cpu \
27- 2>&AS_MESSAGE_LOG_FD
28- )
29+ SYMVER_FLOOR=GLIBC_2.0
30 AC_MSG_RESULT([$SYMVER_FLOOR])
31 case "$SYMVER_FLOOR" in
32 ERROR)
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 @@
1If you pass CFLAGS with a leading space, " " gets passed to popen and convinces
2gcc to try and open a file called " ". This results in a confusing error message
3like:
4
5x86_64-pokysdk-linux-gcc: error: : No such file or directory
6
7Avoid this by stripping empty elements out of CFLAGS.
8
9Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126]
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12Index: 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