summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-03-18 12:55:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-20 18:54:56 +0000
commitb24332906d7d3f057a1b75a2fc6a5704396aa7b4 (patch)
tree7b9c1107f2e497375687918fe0558f3391951576 /meta/recipes-core
parent43600886d774a9c52870988a7a19bcd20c6093bb (diff)
downloadpoky-b24332906d7d3f057a1b75a2fc6a5704396aa7b4.tar.gz
libxcrypt: fix sporadic failures in nativesdk-libxcrypt-compat
(From OE-Core rev: ee1dca4ad342455c800b4ff38f375f5c40cfbdf6) 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.patch32
-rw-r--r--meta/recipes-core/libxcrypt/libxcrypt.inc4
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 @@
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/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 \
9 9
10inherit autotools pkgconfig 10inherit autotools pkgconfig
11 11
12SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" 12SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \
13 file://0001-configure.ac-do-not-use-compute-symver-floor.patch \
14 "
13SRCREV = "94d84f92ca123d851586016c4678eb1f21c19029" 15SRCREV = "94d84f92ca123d851586016c4678eb1f21c19029"
14SRCBRANCH ?= "develop" 16SRCBRANCH ?= "develop"
15 17