Re: [meta-oe][PATCH] systemd_git.bb: Alias mkostemp() to mkstemp() for uclibc targets

[Koen Kooi <koen@dominion.thruhere.net>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Thanks, both are in

On 01-07-11 07:38, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../systemd/systemd/paper-over-mkostemp.patch      |   19 +++++++++++++++++++
>  meta-oe/recipes-core/systemd/systemd_git.bb        |    3 ++-
>  2 files changed, 21 insertions(+), 1 deletions(-)
>  create mode 100644 meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch
> 
> 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@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"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFODXCyMkyGM64RGpERAs2xAJkBX+3ccJsW4y9osQSYFq5shzC2LACfe6IX
RN9FH3u/dVImKyDh794PCfg=
=SyuQ
-----END PGP SIGNATURE-----