diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-10-29 11:06:54 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-11-01 17:22:52 -0700 |
commit | b317539ef1f3303a6f23dd0a6abf5a25d39524c8 (patch) | |
tree | 05604dafed7875090b87900b1f46fcd94229865b | |
parent | c578a2fdfd9a1acad23240e8e606478e43115cef (diff) | |
download | meta-openembedded-contrib-b317539ef1f3303a6f23dd0a6abf5a25d39524c8.tar.gz |
mdns: Mark as incompatible with musl
musl does not support mDNS or NSS plugins.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch | 42 | ||||
-rw-r--r-- | meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb | 3 |
2 files changed, 2 insertions, 43 deletions
diff --git a/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch b/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch deleted file mode 100644 index 863866d18e..0000000000 --- a/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d3082d2c606c810aa0a39378bf1e02575af3a301 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 2 Feb 2018 21:54:11 -0800 -Subject: [PATCH] nss_mdns: Do not include nss.h when libc != glibc - -Provide nss_status macro instead for non-glibc case -where nss.h is absent - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - mDNSPosix/nss_mdns.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c -index afadb3c..c469584 100755 ---- a/mDNSPosix/nss_mdns.c -+++ b/mDNSPosix/nss_mdns.c -@@ -378,8 +378,19 @@ init_config (); - - #define ENTNAME hostent - #define DATABASE "hosts" -- -+#ifdef __GLIBC__ - #include <nss.h> -+#else -+enum nss_status -+{ -+ NSS_STATUS_TRYAGAIN = -2, -+ NSS_STATUS_UNAVAIL, -+ NSS_STATUS_NOTFOUND, -+ NSS_STATUS_SUCCESS, -+ NSS_STATUS_RETURN -+}; -+#define NETDB_INTERNAL NULL -+#endif - // For nss_status - #include <netdb.h> - // For hostent --- -2.16.1 - diff --git a/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb b/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb index 1bd17031af..1353b2bed4 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb @@ -4,12 +4,13 @@ HOMEPAGE = "http://developer.apple.com/networking/bonjour/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://../LICENSE;md5=31c50371921e0fb731003bbc665f29bf" +COMPATIBLE_HOST_libc-musl = 'null' + RPROVIDES_${PN} += "libdns_sd.so" SRC_URI = "https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ file://build.patch;patchdir=.. \ file://mdns.service \ - file://0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch;patchdir=.. \ " SRC_URI[md5sum] = "e773f290a7d29f1072247985d6add2ff" SRC_URI[sha256sum] = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0" |