diff options
author | Tim Orling <timothy.t.orling@linux.intel.com> | 2018-01-21 15:45:17 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-01-26 17:28:13 -0800 |
commit | 37da2271b3b0cd6861fbdad0af9e31ca391dbde9 (patch) | |
tree | 8712885721cecfc25eb5e8e156e6a47d7b9670eb /meta-python/recipes-devtools/python/python-systemd | |
parent | fc23f03f02a7bbcc273efff463800c02a2a99fce (diff) | |
download | meta-openembedded-37da2271b3b0cd6861fbdad0af9e31ca391dbde9.tar.gz |
python[3]-systemd: cleanup common content; fix build for musl
* Put common content in python-systemd.inc
* Add patch to provide strndupa() for musl
Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python-systemd')
-rw-r--r-- | meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch b/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch new file mode 100644 index 000000000..d7085a856 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 8b639f9faf6199e47b9eae0698d01a22917b6abe Mon Sep 17 00:00:00 2001 | ||
2 | From: Tim Orling <timothy.t.orling@linux.intel.com> | ||
3 | Date: Fri, 29 Dec 2017 09:17:17 -0800 | ||
4 | Subject: [PATCH] Provide implementation of strndupa for musl | ||
5 | |||
6 | Reuse the approach from oe-core: | ||
7 | /meta/recipes-core/systemd/systemd/0002-src-basic-missing.h-check-for-missing-strndupa.patch | ||
8 | |||
9 | Original patch author: Emil Renner Berthing <systemd@esmil.dk> | ||
10 | |||
11 | Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com | ||
12 | --- | ||
13 | Upstream-Status: Pending | ||
14 | |||
15 | systemd/util.c | 11 +++++++++++ | ||
16 | 1 file changed, 11 insertions(+) | ||
17 | |||
18 | diff --git a/systemd/util.c b/systemd/util.c | ||
19 | index e02c825..277e611 100644 | ||
20 | --- a/systemd/util.c | ||
21 | +++ b/systemd/util.c | ||
22 | @@ -34,6 +34,17 @@ | ||
23 | |||
24 | #include "util.h" | ||
25 | |||
26 | +#if !HAVE_DECL_STRNDUPA | ||
27 | +#define strndupa(s, n) \ | ||
28 | + ({ \ | ||
29 | + const char *__old = (s); \ | ||
30 | + size_t __len = strnlen(__old, (n)); \ | ||
31 | + char *__new = (char *)alloca(__len + 1); \ | ||
32 | + __new[__len] = '\0'; \ | ||
33 | + (char *)memcpy(__new, __old, __len); \ | ||
34 | + }) | ||
35 | +#endif | ||
36 | + | ||
37 | int safe_atou(const char *s, unsigned *ret_u) { | ||
38 | char *x = NULL; | ||
39 | unsigned long l; | ||
40 | -- | ||
41 | 2.13.6 | ||
42 | |||