[PATCH] libnss-mdns: Stop trying to build for musl

[PATCH] libnss-mdns: Stop trying to build for musl

[Adrian Bunk]

There's no point in building an NSS module for a C library
that doesn't support NSS.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
 .../libnss-mdns/0001-check-for-nss.h.patch    | 56 -------------------
 .../libnss-mdns/libnss-mdns_0.10.bb           |  3 +-
 2 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch

diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch b/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch
deleted file mode 100644
index f63eb90cdc..0000000000
--- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From bdf01a581d58eb5340e9238d143dbcac9db5b11c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 30 Jan 2016 19:29:45 +0000
-Subject: [PATCH] check for nss.h
-
-nss.h may not available on all libc implementations, e.g. musl does not
-have this header, this patch detects nss.h presence and defines the data
-types that are required if nss.h is missing on platform
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- configure.ac |  2 +-
- src/nss.c    | 11 +++++++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index aa66bc6..ce19b07 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,7 +71,7 @@ AC_PROG_LIBTOOL
- 
- # Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h nss.h sys/ioctl.h])
-+AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h nss.h sys/ioctl.h nss.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-diff --git a/src/nss.c b/src/nss.c
-index e48e315..406733b 100644
---- a/src/nss.c
-+++ b/src/nss.c
-@@ -29,7 +29,18 @@
- #include <assert.h>
- #include <netdb.h>
- #include <sys/socket.h>
-+#ifdef HAVE_NSS_H
- #include <nss.h>
-+#else
-+enum nss_status {
-+    NSS_STATUS_TRYAGAIN = -2,
-+    NSS_STATUS_UNAVAIL,
-+    NSS_STATUS_NOTFOUND,
-+    NSS_STATUS_SUCCESS,
-+    NSS_STATUS_RETURN
-+};
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- 
--- 
-2.7.0
-
diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
index d0eb2768d1..953505971a 100644
--- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
+++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
@@ -9,7 +9,6 @@ DEPENDS = "avahi"
 PR = "r7"
 
 SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz \
-           file://0001-check-for-nss.h.patch \
            "
 
 SRC_URI[md5sum] = "03938f17646efbb50aa70ba5f99f51d7"
@@ -21,6 +20,8 @@ localstatedir = "/"
 
 inherit autotools
 
+COMPATIBLE_HOST_libc-musl = 'null'
+
 EXTRA_OECONF = "--libdir=${base_libdir} --disable-lynx --enable-avahi"
 
 # suppress warning, but don't bother with autonamer
-- 
2.17.1

Re: [PATCH] libnss-mdns: Stop trying to build for musl

[Khem Raj]

On 5/18/19 10:21 AM, Adrian Bunk wrote:
> There's no point in building an NSS module for a C library
> that doesn't support NSS.
> 

Fundamentally this change looks ok however
have you tried using avahi after this change ?

> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> ---
>   .../libnss-mdns/0001-check-for-nss.h.patch    | 56 -------------------
>   .../libnss-mdns/libnss-mdns_0.10.bb           |  3 +-
>   2 files changed, 2 insertions(+), 57 deletions(-)
>   delete mode 100644 meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch
> 
> diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch b/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch
> deleted file mode 100644
> index f63eb90cdc..0000000000
> --- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch
> +++ /dev/null
> @@ -1,56 +0,0 @@
> -From bdf01a581d58eb5340e9238d143dbcac9db5b11c Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sat, 30 Jan 2016 19:29:45 +0000
> -Subject: [PATCH] check for nss.h
> -
> -nss.h may not available on all libc implementations, e.g. musl does not
> -have this header, this patch detects nss.h presence and defines the data
> -types that are required if nss.h is missing on platform
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> -Upstream-Status: Pending
> -
> - configure.ac |  2 +-
> - src/nss.c    | 11 +++++++++++
> - 2 files changed, 12 insertions(+), 1 deletion(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index aa66bc6..ce19b07 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -71,7 +71,7 @@ AC_PROG_LIBTOOL
> -
> - # Checks for header files.
> - AC_HEADER_STDC
> --AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h nss.h sys/ioctl.h])
> -+AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h nss.h sys/ioctl.h nss.h])
> -
> - # Checks for typedefs, structures, and compiler characteristics.
> - AC_C_CONST
> -diff --git a/src/nss.c b/src/nss.c
> -index e48e315..406733b 100644
> ---- a/src/nss.c
> -+++ b/src/nss.c
> -@@ -29,7 +29,18 @@
> - #include <assert.h>
> - #include <netdb.h>
> - #include <sys/socket.h>
> -+#ifdef HAVE_NSS_H
> - #include <nss.h>
> -+#else
> -+enum nss_status {
> -+    NSS_STATUS_TRYAGAIN = -2,
> -+    NSS_STATUS_UNAVAIL,
> -+    NSS_STATUS_NOTFOUND,
> -+    NSS_STATUS_SUCCESS,
> -+    NSS_STATUS_RETURN
> -+};
> -+#endif
> -+
> - #include <stdio.h>
> - #include <stdlib.h>
> -
> ---
> -2.7.0
> -
> diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
> index d0eb2768d1..953505971a 100644
> --- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
> +++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
> @@ -9,7 +9,6 @@ DEPENDS = "avahi"
>   PR = "r7"
>   
>   SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz \
> -           file://0001-check-for-nss.h.patch \
>              "
>   
>   SRC_URI[md5sum] = "03938f17646efbb50aa70ba5f99f51d7"
> @@ -21,6 +20,8 @@ localstatedir = "/"
>   
>   inherit autotools
>   
> +COMPATIBLE_HOST_libc-musl = 'null'
> +
>   EXTRA_OECONF = "--libdir=${base_libdir} --disable-lynx --enable-avahi"
>   
>   # suppress warning, but don't bother with autonamer
> 

Re: [PATCH] libnss-mdns: Stop trying to build for musl

[Adrian Bunk]

On Sat, May 18, 2019 at 09:56:04PM -0700, Khem Raj wrote:
> 
> 
> On 5/18/19 10:21 AM, Adrian Bunk wrote:
> > There's no point in building an NSS module for a C library
> > that doesn't support NSS.
> > 
> 
> Fundamentally this change looks ok however
> have you tried using avahi after this change ?

No.

The RRECOMMENDS in avahi are already _append_libc-glibc,
and libnss-mdns simply cannot work with musl.

How well Avahi works with musl is therefore invariant.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed