diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-03-31 23:57:35 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-03-31 23:57:35 +0200 |
| commit | 575d4712e1c4305acdba74e1af9277114ce99883 (patch) | |
| tree | 34a1991bb39719d363e91b2207ec2d29e1bf841f | |
| parent | f4a5eed474c561557b0c21a05682ed9585c6c60a (diff) | |
systemd: fix build on uClibc
Patch based on similar patch in openembedded.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/systemd/systemd-uclibc-fix.patch | 40 | ||||
| -rw-r--r-- | package/systemd/systemd.mk | 3 |
2 files changed, 43 insertions, 0 deletions
diff --git a/package/systemd/systemd-uclibc-fix.patch b/package/systemd/systemd-uclibc-fix.patch new file mode 100644 index 000000000..24c32ab94 --- /dev/null +++ b/package/systemd/systemd-uclibc-fix.patch @@ -0,0 +1,40 @@ +[PATCH] fix build with uClibc + +Based on OE patch from Khem Raj: + +http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch + +But extended to also cover execvpe (OE carries a patch adding execvpe +support to uClibc). + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + src/macro.h | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +Index: systemd-37/src/macro.h +=================================================================== +--- systemd-37.orig/src/macro.h ++++ systemd-37/src/macro.h +@@ -27,6 +27,21 @@ + #include <sys/uio.h> + #include <inttypes.h> + ++#ifdef __UCLIBC__ ++/* uclibc does not implement mkostemp GNU extension */ ++#define mkostemp(x,y) mkstemp(x) ++/* uclibc does not implement execvpe GNU extension */ ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++#include <unistd.h> ++static inline int execvpe(const char *file, char *const argv[], ++ char *const envp[]) ++{ ++ environ = (char **)envp; ++ return execvp(file, argv); ++} ++#endif + #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b))) + #define _sentinel_ __attribute__ ((sentinel)) + #define _noreturn_ __attribute__((noreturn)) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index fc49f3c7f..eded47208 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -41,6 +41,9 @@ else SYSTEMD_CONF_OPT += --disable-acl endif +# mq_getattr needs -lrt +SYSTEMD_MAKE_OPT += LIBS=-lrt + define SYSTEMD_INSTALL_INIT_HOOK ln -fs ../bin/systemd $(TARGET_DIR)/sbin/init ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/halt |