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 | |
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')
-rw-r--r-- | meta/recipes-core/libxcrypt/files/0001-configure.ac-do-not-use-compute-symver-floor.patch | 32 | ||||
-rw-r--r-- | meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch | 24 | ||||
-rw-r--r-- | meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.bb (renamed from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.18.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-core/libxcrypt/libxcrypt.inc | 10 | ||||
-rw-r--r-- | meta/recipes-core/libxcrypt/libxcrypt_4.4.19.bb (renamed from meta/recipes-core/libxcrypt/libxcrypt_4.4.18.bb) | 0 |
5 files changed, 29 insertions, 37 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 @@ | |||
1 | From b28bb856ccebe8fded51d11362bf5920699eed59 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 18 Mar 2021 10:52:13 +0000 | ||
4 | Subject: [PATCH] configure.ac: do not use compute-symver-floor | ||
5 | |||
6 | This script (newly introduced in 4.4.18) sporadically fails, without | ||
7 | failing configure(), which has been reported at | ||
8 | https://github.com/besser82/libxcrypt/issues/123 | ||
9 | |||
10 | Upstream-Status: Inappropriate | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | configure.ac | 6 +----- | ||
14 | 1 file changed, 1 insertion(+), 5 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 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 @@ | |||
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 | ||
diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.18.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.bb index ba74eb1f94..ba74eb1f94 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.18.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.bb | |||
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index b5ca863d54..694e55546f 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc | |||
@@ -3,18 +3,18 @@ DESCRIPTION = "Forked code from glibc libary to extract only crypto part." | |||
3 | HOMEPAGE = "https://github.com/besser82/libxcrypt" | 3 | HOMEPAGE = "https://github.com/besser82/libxcrypt" |
4 | SECTION = "libs" | 4 | SECTION = "libs" |
5 | LICENSE = "LGPLv2.1" | 5 | LICENSE = "LGPLv2.1" |
6 | LIC_FILES_CHKSUM = "file://LICENSING;md5=bd5d9777dfe7076c4f2928f12fed226a \ | 6 | LIC_FILES_CHKSUM = "file://LICENSING;md5=afed27a72ae2a8075978299eebaa1f5d \ |
7 | file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ | 7 | file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ |
8 | " | 8 | " |
9 | 9 | ||
10 | inherit autotools pkgconfig | 10 | inherit autotools pkgconfig |
11 | 11 | ||
12 | SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \ | 12 | SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" |
13 | file://0001-configure.ac-do-not-use-compute-symver-floor.patch \ | 13 | SRCREV = "c79119414d7e30017d7b49566e7e4ea35112bdc8" |
14 | " | ||
15 | SRCREV = "94d84f92ca123d851586016c4678eb1f21c19029" | ||
16 | SRCBRANCH ?= "develop" | 14 | SRCBRANCH ?= "develop" |
17 | 15 | ||
16 | SRC_URI += "file://fix_cflags_handling.patch" | ||
17 | |||
18 | PROVIDES = "virtual/crypt" | 18 | PROVIDES = "virtual/crypt" |
19 | 19 | ||
20 | FILES_${PN} = "${libdir}/libcrypt*.so.* \ | 20 | FILES_${PN} = "${libdir}/libcrypt*.so.* \ |
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.18.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.19.bb index 79dba2f6dc..79dba2f6dc 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.18.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.19.bb | |||