diff options
| author | Adrian Bunk <bunk@stusta.de> | 2019-05-18 20:21:35 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-21 12:56:33 +0100 |
| commit | 1df11198ee3d4264c8dc12519be284c573fd4c30 (patch) | |
| tree | 2ac390b6c0f272baf40e61f61fc0c3535c2f6e8b /meta/recipes-connectivity/libnss-mdns | |
| parent | 4b26e42b976268557b67182492374f6d9613545f (diff) | |
| download | poky-1df11198ee3d4264c8dc12519be284c573fd4c30.tar.gz | |
libnss-mdns: Stop trying to build for musl
There's no point in building an NSS module for a C library
that doesn't support NSS.
(From OE-Core rev: e3197eeaf352cb5c578a675ce2a07881fad597e6)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/libnss-mdns')
| -rw-r--r-- | meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch | 56 | ||||
| -rw-r--r-- | meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb | 3 |
2 files changed, 2 insertions, 57 deletions
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 @@ | |||
| 1 | From bdf01a581d58eb5340e9238d143dbcac9db5b11c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 30 Jan 2016 19:29:45 +0000 | ||
| 4 | Subject: [PATCH] check for nss.h | ||
| 5 | |||
| 6 | nss.h may not available on all libc implementations, e.g. musl does not | ||
| 7 | have this header, this patch detects nss.h presence and defines the data | ||
| 8 | types that are required if nss.h is missing on platform | ||
| 9 | |||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | Upstream-Status: Pending | ||
| 13 | |||
| 14 | configure.ac | 2 +- | ||
| 15 | src/nss.c | 11 +++++++++++ | ||
| 16 | 2 files changed, 12 insertions(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/configure.ac b/configure.ac | ||
| 19 | index aa66bc6..ce19b07 100644 | ||
| 20 | --- a/configure.ac | ||
| 21 | +++ b/configure.ac | ||
| 22 | @@ -71,7 +71,7 @@ AC_PROG_LIBTOOL | ||
| 23 | |||
| 24 | # Checks for header files. | ||
| 25 | AC_HEADER_STDC | ||
| 26 | -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]) | ||
| 27 | +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]) | ||
| 28 | |||
| 29 | # Checks for typedefs, structures, and compiler characteristics. | ||
| 30 | AC_C_CONST | ||
| 31 | diff --git a/src/nss.c b/src/nss.c | ||
| 32 | index e48e315..406733b 100644 | ||
| 33 | --- a/src/nss.c | ||
| 34 | +++ b/src/nss.c | ||
| 35 | @@ -29,7 +29,18 @@ | ||
| 36 | #include <assert.h> | ||
| 37 | #include <netdb.h> | ||
| 38 | #include <sys/socket.h> | ||
| 39 | +#ifdef HAVE_NSS_H | ||
| 40 | #include <nss.h> | ||
| 41 | +#else | ||
| 42 | +enum nss_status { | ||
| 43 | + NSS_STATUS_TRYAGAIN = -2, | ||
| 44 | + NSS_STATUS_UNAVAIL, | ||
| 45 | + NSS_STATUS_NOTFOUND, | ||
| 46 | + NSS_STATUS_SUCCESS, | ||
| 47 | + NSS_STATUS_RETURN | ||
| 48 | +}; | ||
| 49 | +#endif | ||
| 50 | + | ||
| 51 | #include <stdio.h> | ||
| 52 | #include <stdlib.h> | ||
| 53 | |||
| 54 | -- | ||
| 55 | 2.7.0 | ||
| 56 | |||
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" | |||
| 9 | PR = "r7" | 9 | PR = "r7" |
| 10 | 10 | ||
| 11 | SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz \ | 11 | SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz \ |
| 12 | file://0001-check-for-nss.h.patch \ | ||
| 13 | " | 12 | " |
| 14 | 13 | ||
| 15 | SRC_URI[md5sum] = "03938f17646efbb50aa70ba5f99f51d7" | 14 | SRC_URI[md5sum] = "03938f17646efbb50aa70ba5f99f51d7" |
| @@ -21,6 +20,8 @@ localstatedir = "/" | |||
| 21 | 20 | ||
| 22 | inherit autotools | 21 | inherit autotools |
| 23 | 22 | ||
| 23 | COMPATIBLE_HOST_libc-musl = 'null' | ||
| 24 | |||
| 24 | EXTRA_OECONF = "--libdir=${base_libdir} --disable-lynx --enable-avahi" | 25 | EXTRA_OECONF = "--libdir=${base_libdir} --disable-lynx --enable-avahi" |
| 25 | 26 | ||
| 26 | # suppress warning, but don't bother with autonamer | 27 | # suppress warning, but don't bother with autonamer |
