[oe-commits] Khem Raj : systemd_git.bb: Alias mkostemp() to mkstemp() for uclibc targets

git version control git at git.openembedded.org
Fri Jul 1 07:01:54 UTC 2011


Module: meta-openembedded.git
Branch: master
Commit: c4f636ad336bf33d986f2bd11086067c18ea5bcc
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c4f636ad336bf33d986f2bd11086067c18ea5bcc

Author: Khem Raj <raj.khem at gmail.com>
Date:   Fri Jul  1 13:38:18 2011 +0000

systemd_git.bb: Alias mkostemp() to mkstemp() for uclibc targets

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../systemd/systemd/paper-over-mkostemp.patch      |   19 +++++++++++++++++++
 meta-oe/recipes-core/systemd/systemd_git.bb        |    3 ++-
 2 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch b/meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch
new file mode 100644
index 0000000..ca10440
--- /dev/null
+++ b/meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch
@@ -0,0 +1,19 @@
+uclibc does not have mkostemp() so we redefine it to use mkstemp()
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+
+Index: git/src/macro.h
+===================================================================
+--- git.orig/src/macro.h	2011-06-30 10:33:53.000000000 -0700
++++ git/src/macro.h	2011-06-30 15:07:28.285270006 -0700
+@@ -27,6 +27,10 @@
+ #include <sys/uio.h>
+ #include <inttypes.h>
+ 
++#ifdef __UCLIBC__
++/* uclibc does not implement mkostemp GNU extention */
++#define mkostemp(x,y) mkstemp(x)
++#endif
+ #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
+ #define _sentinel_ __attribute__ ((sentinel))
+ #define _noreturn_ __attribute__((noreturn))
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 2a313e0..c750b2f 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -15,7 +15,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r3"
+PR = "r4"
 
 inherit autotools vala
 
@@ -23,6 +23,7 @@ SRCREV = "8585357a0e5e9f4d56e999d7cd1a73e77ae0eb80"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
            file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
+           file://paper-over-mkostemp.patch \
           "
 
 S = "${WORKDIR}/git"





More information about the Openembedded-commits mailing list