diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2021-03-18 12:55:57 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-20 18:50:05 +0000 |
| commit | ee1dca4ad342455c800b4ff38f375f5c40cfbdf6 (patch) | |
| tree | 8b71a70b0b6da4e2794bbafa0cef68999c4619ec /meta/recipes-core | |
| parent | 5db15aec00517e5b6f6585b534a2314c226841bf (diff) | |
| download | openembedded-core-ee1dca4ad342455c800b4ff38f375f5c40cfbdf6.tar.gz | |
libxcrypt: fix sporadic failures in nativesdk-libxcrypt-compat
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -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/libxcrypt.inc | 4 |
2 files changed, 35 insertions, 1 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 new file mode 100644 index 0000000000..4e6b427104 --- /dev/null +++ b/meta/recipes-core/libxcrypt/files/0001-configure.ac-do-not-use-compute-symver-floor.patch @@ -0,0 +1,32 @@ +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) diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index e9f968b556..b5ca863d54 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=bd5d9777dfe7076c4f2928f12fed226a \ inherit autotools pkgconfig -SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \ + file://0001-configure.ac-do-not-use-compute-symver-floor.patch \ + " SRCREV = "94d84f92ca123d851586016c4678eb1f21c19029" SRCBRANCH ?= "develop" |