diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-12-12 16:34:48 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2021-01-10 11:10:58 -0800 |
commit | c920ef3decae5a18de6054f1fb3f90c608672bc6 (patch) | |
tree | 1eca08ebdede19123b6a532c9f8e23fb0c7d13ef | |
parent | 4cdd3b13d523385743c0f87ff5636edf906b2146 (diff) | |
download | meta-openembedded-c920ef3decae5a18de6054f1fb3f90c608672bc6.tar.gz |
sdbus-c++-libsystemd: Fix reallocarray check in meson
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 4a171790a66c6adb5bf0994c9b2c85a1ea0b8ce8)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch | 25 | ||||
-rw-r--r-- | meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch new file mode 100644 index 0000000000..d3d339d56d --- /dev/null +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch | |||
@@ -0,0 +1,25 @@ | |||
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 | --- a/meson.build | ||
16 | +++ b/meson.build | ||
17 | @@ -501,7 +501,7 @@ foreach ident : [ | ||
18 | #include <sys/stat.h> | ||
19 | #include <unistd.h>'''], | ||
20 | ['explicit_bzero' , '''#include <string.h>'''], | ||
21 | - ['reallocarray', '''#include <malloc.h>'''], | ||
22 | + ['reallocarray', '''#include <stdlib.h>'''], | ||
23 | ['set_mempolicy', '''#include <stdlib.h> | ||
24 | #include <unistd.h>'''], | ||
25 | ['get_mempolicy', '''#include <stdlib.h> | ||
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb index c8e81a4123..4b93087f4f 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb | |||
@@ -41,6 +41,7 @@ SRC_URI_MUSL = "\ | |||
41 | file://0002-src-login-brightness.c-include-sys-wait.h.patch \ | 41 | file://0002-src-login-brightness.c-include-sys-wait.h.patch \ |
42 | file://0003-src-basic-copy.c-include-signal.h.patch \ | 42 | file://0003-src-basic-copy.c-include-signal.h.patch \ |
43 | file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \ | 43 | file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \ |
44 | file://0001-meson-Fix-reallocarray-check.patch \ | ||
44 | " | 45 | " |
45 | 46 | ||
46 | PACKAGECONFIG ??= "gshadow idn" | 47 | PACKAGECONFIG ??= "gshadow idn" |