diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-12-13 22:01:27 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-16 19:44:50 +0000 |
commit | 38b45cd73eb360ce6dbe441ea497044acd27d777 (patch) | |
tree | 42216d332756c2ecfdcf7366d5eed2006574dcc5 /meta/recipes-core/systemd | |
parent | 82b8dc9cccd32197a775800ee0dfc1841ef00e0c (diff) | |
download | poky-38b45cd73eb360ce6dbe441ea497044acd27d777.tar.gz |
systemd: Fix reallocarray check
Musl brought this latent issue to fore
(From OE-Core rev: 6012fffa99b600956ea1076d60e050d0737b4c4f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-meson-Fix-reallocarray-check.patch | 30 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_246.6.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Fix-reallocarray-check.patch b/meta/recipes-core/systemd/systemd/0001-meson-Fix-reallocarray-check.patch new file mode 100644 index 0000000000..1229dd6e17 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-meson-Fix-reallocarray-check.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 1ebf1a1df17afd8b89f84b1928a89069035bf20b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 12 Dec 2020 16:15:57 -0800 | ||
4 | Subject: [PATCH] meson: Fix reallocarray check | ||
5 | |||
6 | reallocarray() is defined in stdlib.h, so that would be right header to | ||
7 | check for its presense. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/17951] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | meson.build | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/meson.build b/meson.build | ||
16 | index d205f846c7..e0a3c53529 100644 | ||
17 | --- a/meson.build | ||
18 | +++ b/meson.build | ||
19 | @@ -517,7 +517,7 @@ foreach ident : [ | ||
20 | #include <sys/stat.h> | ||
21 | #include <unistd.h>'''], | ||
22 | ['explicit_bzero' , '''#include <string.h>'''], | ||
23 | - ['reallocarray', '''#include <malloc.h>'''], | ||
24 | + ['reallocarray', '''#include <stdlib.h>'''], | ||
25 | ['set_mempolicy', '''#include <stdlib.h> | ||
26 | #include <unistd.h>'''], | ||
27 | ['get_mempolicy', '''#include <stdlib.h> | ||
28 | -- | ||
29 | 2.29.2 | ||
30 | |||
diff --git a/meta/recipes-core/systemd/systemd_246.6.bb b/meta/recipes-core/systemd/systemd_246.6.bb index d9e7b1a00c..b89eff6be2 100644 --- a/meta/recipes-core/systemd/systemd_246.6.bb +++ b/meta/recipes-core/systemd/systemd_246.6.bb | |||
@@ -24,6 +24,7 @@ SRC_URI += "file://touchscreen.rules \ | |||
24 | file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ | 24 | file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ |
25 | file://selinux-hook-handling-to-enumerate-nexthop.patch \ | 25 | file://selinux-hook-handling-to-enumerate-nexthop.patch \ |
26 | file://0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch \ | 26 | file://0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch \ |
27 | file://0001-meson-Fix-reallocarray-check.patch \ | ||
27 | " | 28 | " |
28 | 29 | ||
29 | # patches needed by musl | 30 | # patches needed by musl |