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>
This commit is contained in:
Richard Purdie
2021-04-30 10:35:02 +01:00
parent c21419b1fe
commit 19c365d040
5 changed files with 29 additions and 37 deletions

View File

@@ -1,32 +0,0 @@
From b28bb856ccebe8fded51d11362bf5920699eed59 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 18 Mar 2021 10:52:13 +0000
Subject: [PATCH] configure.ac: do not use compute-symver-floor
This script (newly introduced in 4.4.18) sporadically fails, without
failing configure(), which has been reported at
https://github.com/besser82/libxcrypt/issues/123
Upstream-Status: Inappropriate
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
configure.ac | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 45b91b4..f3ba945 100644
--- a/configure.ac
+++ b/configure.ac
@@ -426,11 +426,7 @@ if test x$enable_shared != xyes; then enable_obsolete_api=0; fi
# need to be binary backward compatible with.
if test $enable_obsolete_api = 1; then
AC_MSG_CHECKING([minimum symbol version to use for compatibility symbols])
- SYMVER_FLOOR=$(
- $PERL ${srcdir}/build-aux/compute-symver-floor \
- ${srcdir}/lib/libcrypt.minver $host_os $host_cpu \
- 2>&AS_MESSAGE_LOG_FD
- )
+ SYMVER_FLOOR=GLIBC_2.0
AC_MSG_RESULT([$SYMVER_FLOOR])
case "$SYMVER_FLOOR" in
ERROR)

View File

@@ -0,0 +1,24 @@
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:
x86_64-pokysdk-linux-gcc: error: : No such file or directory
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
@@ -36,6 +36,8 @@ sub preprocessor_check {
die "C compiler not available\n" unless @CC;
@CFLAGS = sh_split($ENV{CFLAGS} // q{});
+ # 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

View File

@@ -3,18 +3,18 @@ DESCRIPTION = "Forked code from glibc libary to extract only crypto part."
HOMEPAGE = "https://github.com/besser82/libxcrypt"
SECTION = "libs"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSING;md5=bd5d9777dfe7076c4f2928f12fed226a \
LIC_FILES_CHKSUM = "file://LICENSING;md5=afed27a72ae2a8075978299eebaa1f5d \
file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
"
inherit autotools pkgconfig
SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \
file://0001-configure.ac-do-not-use-compute-symver-floor.patch \
"
SRCREV = "94d84f92ca123d851586016c4678eb1f21c19029"
SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}"
SRCREV = "c79119414d7e30017d7b49566e7e4ea35112bdc8"
SRCBRANCH ?= "develop"
SRC_URI += "file://fix_cflags_handling.patch"
PROVIDES = "virtual/crypt"
FILES_${PN} = "${libdir}/libcrypt*.so.* \