summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-15 03:51:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-18 23:52:53 +0100
commitc879b0797b07572c85bc9d48053f601d6fcf3087 (patch)
treefe63c55eb697f9c88cfdbe367ff1b3c7d163d481 /meta
parentb96c342fbd9fb939e8661b9019c7b9a424d50a70 (diff)
downloadpoky-c879b0797b07572c85bc9d48053f601d6fcf3087.tar.gz
libxcrypt-compat: upgrade 4.4.19 -> 4.4.20
(From OE-Core rev: d7eb1125e974fddd43062665bd5eb29f352832dc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch17
-rw-r--r--meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb (renamed from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.bb)0
-rw-r--r--meta/recipes-core/libxcrypt/libxcrypt.inc2
-rw-r--r--meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb (renamed from meta/recipes-core/libxcrypt/libxcrypt_4.4.19.bb)0
4 files changed, 14 insertions, 5 deletions
diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
index 5448fe0fa6..0772998c72 100644
--- a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
+++ b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
@@ -1,3 +1,8 @@
1From fd9a46695594c3cd836ecb7d959f03f605e69a2f Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Fri, 30 Apr 2021 10:35:02 +0100
4Subject: [PATCH] libxcrypt: Update to 4.4.19 release and fix symbol version
5
1If you pass CFLAGS with a leading space, " " gets passed to popen and convinces 6If 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 7gcc to try and open a file called " ". This results in a confusing error message
3like: 8like:
@@ -9,8 +14,12 @@ Avoid this by stripping empty elements out of CFLAGS.
9Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126] 14Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126]
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 15Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11 16
12Index: a/build-aux/compute-symver-floor 17---
13=================================================================== 18 build-aux/compute-symver-floor | 2 ++
19 1 file changed, 2 insertions(+)
20
21diff --git a/build-aux/compute-symver-floor b/build-aux/compute-symver-floor
22index 4ec82e1..8117342 100644
14--- a/build-aux/compute-symver-floor 23--- a/build-aux/compute-symver-floor
15+++ b/build-aux/compute-symver-floor 24+++ b/build-aux/compute-symver-floor
16@@ -36,6 +36,8 @@ sub preprocessor_check { 25@@ -36,6 +36,8 @@ sub preprocessor_check {
@@ -20,5 +29,5 @@ Index: a/build-aux/compute-symver-floor
20+ # Remove empty elements, particularly leading ones which cause issues with popen below 29+ # Remove empty elements, particularly leading ones which cause issues with popen below
21+ @CFLAGS = grep {$_} @CFLAGS; 30+ @CFLAGS = grep {$_} @CFLAGS;
22 31
23 # We call ensure_C_locale here, not from the main section, 32 # Remove empty elements, particularly leading ones which
24 # because this sub might not get called at all, in which 33 # cause issues with popen below.
diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb
index ba74eb1f94..ba74eb1f94 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc
index 694e55546f..c16068c161 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=afed27a72ae2a8075978299eebaa1f5d \
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}"
13SRCREV = "c79119414d7e30017d7b49566e7e4ea35112bdc8" 13SRCREV = "e73ff0137de5152e69e8abb0bd260541804dfe5a"
14SRCBRANCH ?= "develop" 14SRCBRANCH ?= "develop"
15 15
16SRC_URI += "file://fix_cflags_handling.patch" 16SRC_URI += "file://fix_cflags_handling.patch"
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.19.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb
index 79dba2f6dc..79dba2f6dc 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.19.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb