diff options
author | Gyorgy Sarvari <skandigraun@gmail.com> | 2025-08-01 16:27:44 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-08-07 12:11:15 +0100 |
commit | 8bb6f70acbe37128d4bf0fd3e56867fdc5f39876 (patch) | |
tree | c36e0c057089bd030bbdc4e4e3129cf0d5091283 /meta | |
parent | 8369e8c4c2c8fc410aae3cd9bb96e036a4e63641 (diff) | |
download | poky-8bb6f70acbe37128d4bf0fd3e56867fdc5f39876.tar.gz |
nettle: upgrade 3.10.1 -> 3.10.2
dropped 0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch, as
it is fixed in this release.
Changelog:
https://git.lysator.liu.se/nettle/nettle/-/blob/master/ChangeLog
ptests passed:
All 116 tests passed
DURATION: 2
END: /usr/lib/nettle/ptest
2025-08-01T14:21
STOP: ptest-runner
TOTAL: 1 FAIL: 0
(From OE-Core rev: e02f67fadd6310e1ce9d2313b3b3f9cad59f3696)
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/nettle/nettle/0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch | 44 | ||||
-rw-r--r-- | meta/recipes-support/nettle/nettle_3.10.2.bb (renamed from meta/recipes-support/nettle/nettle_3.10.1.bb) | 3 |
2 files changed, 1 insertions, 46 deletions
diff --git a/meta/recipes-support/nettle/nettle/0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch b/meta/recipes-support/nettle/nettle/0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch deleted file mode 100644 index c6f75e9150..0000000000 --- a/meta/recipes-support/nettle/nettle/0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 20eb61eded3bf2ef03e1f37c8c1535b9c246d0f7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 22 Mar 2025 13:48:29 -0700 | ||
4 | Subject: [PATCH] getopt: Fix getopt/getenv signatures in declarations | ||
5 | |||
6 | GCC-15 complains about this when trying to build on musl | ||
7 | |||
8 | | ../nettle-3.10.1/getopt.c:139:14: error: conflicting types for 'getenv'; have 'char *(void)' | ||
9 | | 139 | extern char *getenv (); | ||
10 | | | ^~~~~~ | ||
11 | |||
12 | Upstream-Status: Submitted [https://lists.lysator.liu.se/mailman/hyperkitty/list/nettle-bugs@lists.lysator.liu.se/thread/R6BDHRO44KSRDAOZQAREYICI2RG5PVNC/] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | getopt.c | 2 +- | ||
16 | getopt.h | 2 +- | ||
17 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/getopt.c b/getopt.c | ||
20 | index 9d29de7..5b89302 100644 | ||
21 | --- a/getopt.c | ||
22 | +++ b/getopt.c | ||
23 | @@ -136,7 +136,7 @@ static struct _getopt_data getopt_data; | ||
24 | whose names are inconsistent. */ | ||
25 | |||
26 | #ifndef getenv | ||
27 | -extern char *getenv (); | ||
28 | +extern char *getenv (const char *); | ||
29 | #endif | ||
30 | |||
31 | #endif /* not __GNU_LIBRARY__ */ | ||
32 | diff --git a/getopt.h b/getopt.h | ||
33 | index da1a01f..ab50792 100644 | ||
34 | --- a/getopt.h | ||
35 | +++ b/getopt.h | ||
36 | @@ -166,7 +166,7 @@ extern int __posix_getopt (int ___argc, char *const *___argv, | ||
37 | # endif | ||
38 | # endif | ||
39 | #else /* not __GNU_LIBRARY__ */ | ||
40 | -extern int getopt (); | ||
41 | +extern int getopt(int, char * const [], const char *); | ||
42 | #endif /* __GNU_LIBRARY__ */ | ||
43 | |||
44 | #ifndef __need_getopt | ||
diff --git a/meta/recipes-support/nettle/nettle_3.10.1.bb b/meta/recipes-support/nettle/nettle_3.10.2.bb index 267a6ed449..e651f68cb9 100644 --- a/meta/recipes-support/nettle/nettle_3.10.1.bb +++ b/meta/recipes-support/nettle/nettle_3.10.2.bb | |||
@@ -18,10 +18,9 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ | |||
18 | file://Add-target-to-only-build-tests-not-run-them.patch \ | 18 | file://Add-target-to-only-build-tests-not-run-them.patch \ |
19 | file://run-ptest \ | 19 | file://run-ptest \ |
20 | file://check-header-files-of-openssl-only-if-enable_.patch \ | 20 | file://check-header-files-of-openssl-only-if-enable_.patch \ |
21 | file://0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch \ | ||
22 | " | 21 | " |
23 | 22 | ||
24 | SRC_URI[sha256sum] = "b0fcdd7fc0cdea6e80dcf1dd85ba794af0d5b4a57e26397eee3bc193272d9132" | 23 | SRC_URI[sha256sum] = "fe9ff51cb1f2abb5e65a6b8c10a92da0ab5ab6eaf26e7fc2b675c45f1fb519b5" |
25 | 24 | ||
26 | UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" | 25 | UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" |
27 | 26 | ||