diff options
| author | Khem Raj <raj.khem@gmail.com> | 2015-10-16 00:48:59 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-24 12:17:30 +0100 |
| commit | a267cf21b8e7c79e53354bd645c205f617de816c (patch) | |
| tree | b1335051afaf9830f0c30a95df3bc457afe04b07 /meta/recipes-core | |
| parent | b37b0f1ffd7e63484136b3715bfdf3a9c5e45f73 (diff) | |
| download | openembedded-core-a267cf21b8e7c79e53354bd645c205f617de816c.tar.gz openembedded-core-a267cf21b8e7c79e53354bd645c205f617de816c.tar.bz2 openembedded-core-a267cf21b8e7c79e53354bd645c205f617de816c.zip | |
systemd: Fix build with uclibc
225 needs additional patches for cater for new APIs used
in systemd
Change-Id: Idb66c2c6bb65c94b52ba35b276ca12cc868b043e
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core')
3 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch b/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch new file mode 100644 index 0000000000..76ce4b7813 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch @@ -0,0 +1,22 @@ +Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch + +exp10 extension is not part of uClibc, so compute it. + + +Signed-off-by: Samuel Martin <s.martin49@gmail.com> + +Upstream-Status: Pending + +Index: git/src/basic/missing.h +=================================================================== +--- git.orig/src/basic/missing.h ++++ git/src/basic/missing.h +@@ -1036,3 +1036,8 @@ static inline int kcmp(pid_t pid1, pid_t + #ifndef INPUT_PROP_ACCELEROMETER + #define INPUT_PROP_ACCELEROMETER 0x06 + #endif ++ ++#ifdef __UCLIBC__ ++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */ ++#define exp10(x) (exp((x) * log(10))) ++#endif /* __UCLIBC__ */ diff --git a/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch b/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch new file mode 100644 index 0000000000..30e38173e6 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch @@ -0,0 +1,39 @@ +From cb71e4beea3b3b11e5951f95c829cd2eee9fcf7b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 12 Sep 2015 19:10:04 +0000 +Subject: [PATCH 22/31] Use getenv when secure versions are not available + +musl doesnt implement secure version, so we default +to it if configure does not detect a secure imeplementation + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Rejected + + src/basic/missing.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/basic/missing.h b/src/basic/missing.h +index bf9b490..d6dbc7d 100644 +--- a/src/basic/missing.h ++++ b/src/basic/missing.h +@@ -584,13 +584,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle + return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags); + } + #endif +- +-#ifndef HAVE_SECURE_GETENV ++#ifdef HAVE_SECURE_GETENV + # ifdef HAVE___SECURE_GETENV + # define secure_getenv __secure_getenv + # else + # error "neither secure_getenv nor __secure_getenv are available" + # endif ++#else ++# define secure_getenv getenv + #endif + + #ifndef CIFS_MAGIC_NUMBER +-- +2.5.2 + diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb index c2dad58754..18c2448124 100644 --- a/meta/recipes-core/systemd/systemd_225.bb +++ b/meta/recipes-core/systemd/systemd_225.bb @@ -53,6 +53,8 @@ S = "${WORKDIR}/git" SRC_URI_append_libc-uclibc = "\ file://0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch \ + file://0022-Use-getenv-when-secure-versions-are-not-available.patch \ + file://0001-fix-build-on-uClibc-exp10.patch \ " LDFLAGS_append_libc-uclibc = " -lrt" |