[oe] [meta-networking] [PATCH] atftp: fixes musl libc build

[Khem Raj]

On Mon, Sep 26, 2016 at 9:21 AM,  <liu.ming50 at gmail.com> wrote:
> From: Ming Liu <peter.x.liu at external.atlascopco.com>
>
> The patches derive from buildroot:
> https://git.busybox.net/buildroot/commit/?id=ef33c008e3c5048d1442f8b0f6336db2fa8d79a1
>
> Signed-off-by: Ming Liu <peter.x.liu at external.atlascopco.com>
> ---
>  ...gz.h-fix-musl-compile-add-missing-defines.patch | 45 ++++++++++++++++++++++
>  ...-tftpd.h-fix-musl-compile-missing-include.patch | 43 +++++++++++++++++++++
>  meta-networking/recipes-daemons/atftp/atftp_git.bb |  4 ++
>  3 files changed, 92 insertions(+)
>  create mode 100644 meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch
>  create mode 100644 meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch
>
> diff --git a/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch b/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch
> new file mode 100644
> index 0000000..cfa8a73
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch
> @@ -0,0 +1,45 @@
> +From 543e67919f5cacf309ac88ab091331e41af4224b Mon Sep 17 00:00:00 2001
> +From: Peter Seiderer <ps.report at gmx.net>
> +Date: Thu, 16 Apr 2015 22:41:57 +0200
> +Subject: [PATCH] argz.h: fix musl compile (add missing defines)
> +
> +Upstream-Status: Pending
> +
> +Add __THROW, __BEGIN_DECLS, __END_DECLS and __attribute_pure__ defines.
> +
> +Signed-off-by: Peter Seiderer <ps.report at gmx.net>
> +Signed-off-by: Ming Liu <peter.x.liu at external.atlascopco.com>
> +---
> + argz.h | 16 ++++++++++++++++
> + 1 file changed, 16 insertions(+)
> +
> +diff --git a/argz.h b/argz.h
> +index 582be55..bdf9f62 100644
> +--- a/argz.h
> ++++ b/argz.h
> +@@ -48,6 +48,22 @@
> + # define __const const
> + #endif
> +
> ++#ifndef __THROW
> ++# define __THROW
> ++#endif
> ++
> ++#ifndef __BEGIN_DECLS
> ++# define __BEGIN_DECLS
> ++#endif
> ++
> ++#ifndef __END_DECLS
> ++# define __END_DECLS
> ++#endif

These probably are not needed, you can just use

#ifdef __cplusplus
extern "C" {
#endif

and

#ifdef __cplusplus
}
#endif

read through. http://wiki.musl-libc.org/wiki/FAQ
for more details.



> ++
> ++#ifndef __attribute_pure__
> ++# define __attribute_pure__
> ++#endif
> ++
> + #ifndef __error_t_defined
> + typedef int error_t;
> + #endif
> +--
> +2.1.4
> +
> diff --git a/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch b/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch
> new file mode 100644
> index 0000000..093054c
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch
> @@ -0,0 +1,43 @@
> +From 77e399899d9d7297d23c321811b628febdf0fd92 Mon Sep 17 00:00:00 2001
> +From: Peter Seiderer <ps.report at gmx.net>
> +Date: Thu, 16 Apr 2015 22:43:49 +0200
> +Subject: [PATCH] tftp.h/tftpd.h: fix musl compile (missing include)
> +
> +Upstream-Status: Pending
> +
> +Add sys/types.h include for u_char typedef.
> +
> +Signed-off-by: Peter Seiderer <ps.report at gmx.net>
> +Signed-off-by: Ming Liu <peter.x.liu at external.atlascopco.com>
> +---
> + tftp.h  | 1 +
> + tftpd.h | 1 +
> + 2 files changed, 2 insertions(+)
> +
> +diff --git a/tftp.h b/tftp.h
> +index 12bd6aa..32a3f63 100644
> +--- a/tftp.h
> ++++ b/tftp.h
> +@@ -19,6 +19,7 @@
> +
> + #include <sys/time.h>
> + #include <sys/times.h>
> ++#include <sys/types.h>
> + #include "tftp_def.h"
> + #include "config.h"
> +
> +diff --git a/tftpd.h b/tftpd.h
> +index 945065e..60d3a49 100644
> +--- a/tftpd.h
> ++++ b/tftpd.h
> +@@ -20,6 +20,7 @@
> + #include <pthread.h>
> + #include <arpa/tftp.h>
> + #include <arpa/inet.h>
> ++#include <sys/types.h>
> + #include "tftp_io.h"
> +
> + /*
> +--
> +2.1.4
> +
> diff --git a/meta-networking/recipes-daemons/atftp/atftp_git.bb b/meta-networking/recipes-daemons/atftp/atftp_git.bb
> index b222c34..a9949d5 100644
> --- a/meta-networking/recipes-daemons/atftp/atftp_git.bb
> +++ b/meta-networking/recipes-daemons/atftp/atftp_git.bb
> @@ -15,6 +15,10 @@ SRC_URI = "git://git.code.sf.net/p/atftp/code \
>             file://atftpd.service \
>             file://atftp-0.7-sorcerers_apprentice.patch \
>  "
> +SRC_URI_append_libc-musl = " file://0001-argz.h-fix-musl-compile-add-missing-defines.patch \
> +                             file://0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch \
> +                           "
> +


Dont make them musl specific, they should be fine for glibc, if not
then fix them such that they are
>  S = "${WORKDIR}/git"
>
>  inherit autotools update-rc.d systemd
> --
> 1.9.1
>