mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 21:32:12 +02:00
libxcrypt: update 4.4.36 -> 4.4.37
Drop patch merged upstream. (From OE-Core rev: b66d046a3fe4230ba3b74c6741419f51bbfca9bd) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
5dfd5fe73d
commit
defeea4c2e
@@ -1,39 +0,0 @@
|
||||
From cfe9f4d6b0a5d10a15e10e987d528c5c513a42f1 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Tue, 19 Dec 2023 11:00:11 +0100
|
||||
Subject: [PATCH] configure: Only text the makecontext signature we need
|
||||
|
||||
The test/explicit-bzero.c test uses a start routine without any
|
||||
arguments. There is no need for the multi-argument version.
|
||||
|
||||
This avoids a build failure with glibc and future compilers.
|
||||
The GNU C library declares the makecontext callback of
|
||||
type void (*) (void), so no cast is needed. On other systems,
|
||||
the type may be the (currently distinct) type void (*) (),
|
||||
but given that this only affects the ability to execute a test,
|
||||
no further machinery is added here to detect that different type.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/178/]
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
---
|
||||
configure.ac | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 016997c..4b8afd8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -303,13 +303,11 @@ AS_IF([test $ac_cv_header_ucontext_h = yes],
|
||||
#include <ucontext.h>
|
||||
static int x;
|
||||
static void fn1(void) {}
|
||||
-static void fn2(int a, int b) { x = a - b; }
|
||||
]], [[
|
||||
ucontext_t uc1, uc2;
|
||||
if (getcontext(&uc1)) return 1;
|
||||
if (setcontext(&uc1)) return 1;
|
||||
makecontext(&uc1, fn1, 0);
|
||||
- makecontext(&uc2, fn2, 2, 1, 1);
|
||||
if (swapcontext(&uc1, &uc2)) return 1;
|
||||
return x;
|
||||
]])],
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7b2a0cdc281d94a5782c37ef87040c341447b4b4 Mon Sep 17 00:00:00 2001
|
||||
From 1e94a03541e35718dc1eaa8023e0ec3cf2de369b 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
|
||||
@@ -13,7 +13,6 @@ 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>
|
||||
|
||||
---
|
||||
build-aux/scripts/compute-symver-floor | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
@@ -16,3 +16,4 @@ do_install:append () {
|
||||
rm -rf ${D}${libdir}/libcrypt.so
|
||||
rm -rf ${D}${datadir}
|
||||
}
|
||||
|
||||
@@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https"
|
||||
SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf"
|
||||
SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https \
|
||||
file://fix_cflags_handling.patch \
|
||||
"
|
||||
SRCREV = "e5714d1f0a477f91ce3986fa63651c7710f0e183"
|
||||
SRCBRANCH ?= "master"
|
||||
|
||||
SRC_URI += "file://fix_cflags_handling.patch \
|
||||
file://configure-c99.patch"
|
||||
|
||||
PROVIDES = "virtual/crypt"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user