mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 09:49:33 +02:00
libxcrypt-compat: upgrade 4.4.19 -> 4.4.20
(From OE-Core rev: d7eb1125e974fddd43062665bd5eb29f352832dc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -1,3 +1,8 @@
|
|||||||
|
From fd9a46695594c3cd836ecb7d959f03f605e69a2f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||||
|
Date: Fri, 30 Apr 2021 10:35:02 +0100
|
||||||
|
Subject: [PATCH] libxcrypt: Update to 4.4.19 release and fix symbol version
|
||||||
|
|
||||||
If you pass CFLAGS with a leading space, " " gets passed to popen and convinces
|
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
|
gcc to try and open a file called " ". This results in a confusing error message
|
||||||
like:
|
like:
|
||||||
@@ -9,8 +14,12 @@ Avoid this by stripping empty elements out of CFLAGS.
|
|||||||
Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126]
|
Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126]
|
||||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||||
|
|
||||||
Index: a/build-aux/compute-symver-floor
|
---
|
||||||
===================================================================
|
build-aux/compute-symver-floor | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/build-aux/compute-symver-floor b/build-aux/compute-symver-floor
|
||||||
|
index 4ec82e1..8117342 100644
|
||||||
--- a/build-aux/compute-symver-floor
|
--- a/build-aux/compute-symver-floor
|
||||||
+++ b/build-aux/compute-symver-floor
|
+++ b/build-aux/compute-symver-floor
|
||||||
@@ -36,6 +36,8 @@ sub preprocessor_check {
|
@@ -36,6 +36,8 @@ sub preprocessor_check {
|
||||||
@@ -20,5 +29,5 @@ Index: a/build-aux/compute-symver-floor
|
|||||||
+ # Remove empty elements, particularly leading ones which cause issues with popen below
|
+ # Remove empty elements, particularly leading ones which cause issues with popen below
|
||||||
+ @CFLAGS = grep {$_} @CFLAGS;
|
+ @CFLAGS = grep {$_} @CFLAGS;
|
||||||
|
|
||||||
# We call ensure_C_locale here, not from the main section,
|
# Remove empty elements, particularly leading ones which
|
||||||
# because this sub might not get called at all, in which
|
# cause issues with popen below.
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=afed27a72ae2a8075978299eebaa1f5d \
|
|||||||
inherit autotools pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}"
|
SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}"
|
||||||
SRCREV = "c79119414d7e30017d7b49566e7e4ea35112bdc8"
|
SRCREV = "e73ff0137de5152e69e8abb0bd260541804dfe5a"
|
||||||
SRCBRANCH ?= "develop"
|
SRCBRANCH ?= "develop"
|
||||||
|
|
||||||
SRC_URI += "file://fix_cflags_handling.patch"
|
SRC_URI += "file://fix_cflags_handling.patch"
|
||||||
|
|||||||
Reference in New Issue
Block a user