diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2025-01-08 09:42:20 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-01-10 11:10:00 +0000 |
| commit | defeea4c2ef3f75f13700070e3a78df6a0dfbef6 (patch) | |
| tree | 02e04e8ee1bda77d375fc13d84b8edfa70a77b8a /meta/recipes-core/libxcrypt/files | |
| parent | 5dfd5fe73de89c80d1bfb3b4963e5be21a570aa3 (diff) | |
| download | poky-defeea4c2ef3f75f13700070e3a78df6a0dfbef6.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-core/libxcrypt/files')
| -rw-r--r-- | meta/recipes-core/libxcrypt/files/configure-c99.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch | 3 |
2 files changed, 1 insertions, 41 deletions
diff --git a/meta/recipes-core/libxcrypt/files/configure-c99.patch b/meta/recipes-core/libxcrypt/files/configure-c99.patch deleted file mode 100644 index b77ea7af07..0000000000 --- a/meta/recipes-core/libxcrypt/files/configure-c99.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From cfe9f4d6b0a5d10a15e10e987d528c5c513a42f1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Florian Weimer <fweimer@redhat.com> | ||
| 3 | Date: Tue, 19 Dec 2023 11:00:11 +0100 | ||
| 4 | Subject: [PATCH] configure: Only text the makecontext signature we need | ||
| 5 | |||
| 6 | The test/explicit-bzero.c test uses a start routine without any | ||
| 7 | arguments. There is no need for the multi-argument version. | ||
| 8 | |||
| 9 | This avoids a build failure with glibc and future compilers. | ||
| 10 | The GNU C library declares the makecontext callback of | ||
| 11 | type void (*) (void), so no cast is needed. On other systems, | ||
| 12 | the type may be the (currently distinct) type void (*) (), | ||
| 13 | but given that this only affects the ability to execute a test, | ||
| 14 | no further machinery is added here to detect that different type. | ||
| 15 | |||
| 16 | Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/178/] | ||
| 17 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 18 | --- | ||
| 19 | configure.ac | 2 -- | ||
| 20 | 1 file changed, 2 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/configure.ac b/configure.ac | ||
| 23 | index 016997c..4b8afd8 100644 | ||
| 24 | --- a/configure.ac | ||
| 25 | +++ b/configure.ac | ||
| 26 | @@ -303,13 +303,11 @@ AS_IF([test $ac_cv_header_ucontext_h = yes], | ||
| 27 | #include <ucontext.h> | ||
| 28 | static int x; | ||
| 29 | static void fn1(void) {} | ||
| 30 | -static void fn2(int a, int b) { x = a - b; } | ||
| 31 | ]], [[ | ||
| 32 | ucontext_t uc1, uc2; | ||
| 33 | if (getcontext(&uc1)) return 1; | ||
| 34 | if (setcontext(&uc1)) return 1; | ||
| 35 | makecontext(&uc1, fn1, 0); | ||
| 36 | - makecontext(&uc2, fn2, 2, 1, 1); | ||
| 37 | if (swapcontext(&uc1, &uc2)) return 1; | ||
| 38 | return x; | ||
| 39 | ]])], | ||
diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch index 94aa3fed49..879950bbe3 100644 --- a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch +++ b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 7b2a0cdc281d94a5782c37ef87040c341447b4b4 Mon Sep 17 00:00:00 2001 | 1 | From 1e94a03541e35718dc1eaa8023e0ec3cf2de369b Mon Sep 17 00:00:00 2001 |
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 3 | Date: Fri, 30 Apr 2021 10:35:02 +0100 | 3 | Date: Fri, 30 Apr 2021 10:35:02 +0100 |
| 4 | Subject: [PATCH] libxcrypt: Update to 4.4.19 release and fix symbol version | 4 | 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. | |||
| 13 | 13 | ||
| 14 | Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126] | 14 | Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126] |
| 15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 16 | |||
| 17 | --- | 16 | --- |
| 18 | build-aux/scripts/compute-symver-floor | 2 ++ | 17 | build-aux/scripts/compute-symver-floor | 2 ++ |
| 19 | 1 file changed, 2 insertions(+) | 18 | 1 file changed, 2 insertions(+) |
