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 | 2221b6b31919ebf936fa5085c11ebd4d8b1d08b6 (patch) | |
| tree | e7ec7a57217e4605462b75d647350bdc3a21c861 /recipes-devtools/python/python-systemd | |
| parent | c6073c7a5f9363e1537a5435cc129f331c5476a2 (diff) | |
| download | meta-python2-2221b6b31919ebf936fa5085c11ebd4d8b1d08b6.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
(From meta-openembedded commit: 37da2271b3b0cd6861fbdad0af9e31ca391dbde9)
Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Tim Orling <ticotimo@gmail.com>
Diffstat (limited to 'recipes-devtools/python/python-systemd')
| -rw-r--r-- | recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch b/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch new file mode 100644 index 0000000..d7085a8 --- /dev/null +++ b/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch @@ -0,0 +1,42 @@ +From 8b639f9faf6199e47b9eae0698d01a22917b6abe Mon Sep 17 00:00:00 2001 +From: Tim Orling <timothy.t.orling@linux.intel.com> +Date: Fri, 29 Dec 2017 09:17:17 -0800 +Subject: [PATCH] Provide implementation of strndupa for musl + +Reuse the approach from oe-core: +/meta/recipes-core/systemd/systemd/0002-src-basic-missing.h-check-for-missing-strndupa.patch + +Original patch author: Emil Renner Berthing <systemd@esmil.dk> + +Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com +--- +Upstream-Status: Pending + + systemd/util.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/systemd/util.c b/systemd/util.c +index e02c825..277e611 100644 +--- a/systemd/util.c ++++ b/systemd/util.c +@@ -34,6 +34,17 @@ + + #include "util.h" + ++#if !HAVE_DECL_STRNDUPA ++#define strndupa(s, n) \ ++ ({ \ ++ const char *__old = (s); \ ++ size_t __len = strnlen(__old, (n)); \ ++ char *__new = (char *)alloca(__len + 1); \ ++ __new[__len] = '\0'; \ ++ (char *)memcpy(__new, __old, __len); \ ++ }) ++#endif ++ + int safe_atou(const char *s, unsigned *ret_u) { + char *x = NULL; + unsigned long l; +-- +2.13.6 + |