diff options
author | Alexander Kanavin <alex@linutronix.de> | 2024-11-25 13:01:08 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-11-27 14:58:48 +0000 |
commit | 351893f3701b525eda317b52766e590743485bba (patch) | |
tree | ec38195721453536c12a0d21a2a198f8870447c7 /meta/recipes-support | |
parent | 2d387f7ec41f4a6f2be5b1a49d031b0e0336327d (diff) | |
download | poky-351893f3701b525eda317b52766e590743485bba.tar.gz |
npth: upgrade 1.7 -> 1.8
(From OE-Core rev: 9e6955dd85e8f7bfb835c1488aae38107604699c)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/npth/npth/musl-fix.patch | 37 | ||||
-rw-r--r-- | meta/recipes-support/npth/npth_1.8.bb (renamed from meta/recipes-support/npth/npth_1.7.bb) | 6 |
2 files changed, 2 insertions, 41 deletions
diff --git a/meta/recipes-support/npth/npth/musl-fix.patch b/meta/recipes-support/npth/npth/musl-fix.patch deleted file mode 100644 index fabe78b14c..0000000000 --- a/meta/recipes-support/npth/npth/musl-fix.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 417abd56fd7bf45cd4948414050615cb1ad59134 Mon Sep 17 00:00:00 2001 | ||
2 | From: NIIBE Yutaka <gniibe@fsij.org> | ||
3 | Date: Fri, 1 Mar 2024 13:53:52 +0900 | ||
4 | Subject: [PATCH] Fix INSERT_EXPOSE_RWLOCK_API for musl C library. | ||
5 | |||
6 | * configure.ac: Add a case for musl system. | ||
7 | |||
8 | Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=417abd56fd7bf45cd4948414050615cb1ad59134] | ||
9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
10 | -- | ||
11 | |||
12 | GnuPG-bug-id: 5664 | ||
13 | Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> | ||
14 | --- | ||
15 | configure.ac | 5 ++++- | ||
16 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index c1091b1..576a26e 100644 | ||
20 | --- a/configure.ac | ||
21 | +++ b/configure.ac | ||
22 | @@ -381,7 +381,10 @@ fi | ||
23 | AC_SUBST(INSERT_NO_RWLOCK) | ||
24 | |||
25 | case "${host}" in | ||
26 | - *-*-linux*|*-*-gnu*) | ||
27 | + *-*-linux-musl*) | ||
28 | + INSERT_EXPOSE_RWLOCK_API="1" | ||
29 | + ;; | ||
30 | + *-*-linux-gnu*|*-*-gnu*) | ||
31 | INSERT_EXPOSE_RWLOCK_API="defined(__USE_UNIX98) || defined(__USE_XOPEN2K)" | ||
32 | ;; | ||
33 | *) | ||
34 | -- | ||
35 | 2.30.2 | ||
36 | |||
37 | |||
diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.8.bb index 0cf35565a3..a354af2a7c 100644 --- a/meta/recipes-support/npth/npth_1.7.bb +++ b/meta/recipes-support/npth/npth_1.8.bb | |||
@@ -6,11 +6,9 @@ LICENSE = "LGPL-2.0-or-later" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de" | 6 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de" |
7 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" | 7 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" |
8 | 8 | ||
9 | SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ | 9 | SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2" |
10 | file://musl-fix.patch \ | ||
11 | " | ||
12 | 10 | ||
13 | SRC_URI[sha256sum] = "8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05" | 11 | SRC_URI[sha256sum] = "8bd24b4f23a3065d6e5b26e98aba9ce783ea4fd781069c1b35d149694e90ca3e" |
14 | 12 | ||
15 | inherit autotools multilib_header | 13 | inherit autotools multilib_header |
16 | 14 | ||