nss-myhostname: Stop trying to build for musl
PATCH 1/1 nss-myhostname: Stop trying to build for musl
There's no point in building an NSS module for a C library that doesn't support NSS.
Signed-off-by Adrian Bunk <[email protected]>
--- ...-Check-for-nss.h-presense-before-use.patch | 53 ------------------- .../nss-myhostname/nss-myhostname_0.3.bb | 3 +- 2 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch
meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch deleted +0 -53
@@ -1,53 +0,0 @@ -From d1345871b992f9a055c968963967e728da1a7ffb Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sat, 30 Jan 2016 20:29:06 +0000 -Subject: [PATCH] nss-myhostname: Check for nss.h presense before use - -We do not have nss.h on musl e.g. and configury is already checking for -nss.h presence, use this to define needed data structures if nss.h is -missing on a given libc implementation on a platform - -include stdint.h for uint32_h definition - -Signed-off-by: Khem Raj <[email protected]> ---- -Upstream-Status: Pending - - nss-myhostname.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/nss-myhostname.c b/nss-myhostname.c -index 293166c..6f287f5 100644 ---- a/nss-myhostname.c -+++ b/nss-myhostname.c -@@ -21,7 +21,27 @@ - ***/ - - #include <limits.h> -+#include <stdint.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 -+}; -+/* Data structure used for the 'gethostbyname4_r' function. */ -+struct gaih_addrtuple -+ { -+ struct gaih_addrtuple *next; -+ char *name; -+ int family; -+ uint32_t addr[4]; -+ uint32_t scopeid; -+ }; -+#endif - #include <sys/types.h> - #include <netdb.h> - #include <errno.h> --- -2.7.0 -
meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb +2 -1
@@ -7,7 +7,6 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${PV}.tar.gz \ - file://0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch \ " SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f"
@@ -15,6 +14,8 @@ SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67 inherit autotools distro_features_check +COMPATIBLE_HOST_libc-musl = 'null' + # The systemd has its own copy of nss-myhostname CONFLICT_DISTRO_FEATURES = "systemd"
Signature · 1 line
2.17.1
Quoted 3 lines · Adrian Bunk
There's no point in building an NSS module for a C library that doesn't support NSS.
this patch is ok
Quoted 88 lines
Signed-off-by Adrian Bunk <[email protected]>--- ...-Check-for-nss.h-presense-before-use.patch | 53 ------------------- .../nss-myhostname/nss-myhostname_0.3.bb | 3 +- 2 files changed, 2 insertions(+), 54 deletions(-)delete mode 100644
meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patchmeta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch deleted +0
-53@@ -1,53 +0,0 @@ -From d1345871b992f9a055c968963967e728da1a7ffb Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sat, 30 Jan 2016 20:29:06 +0000 -Subject: [PATCH] nss-myhostname: Check for nss.h presense before use - -We do not have nss.h on musl e.g. and configury is already checking for -nss.h presence, use this to define needed data structures if nss.h is -missing on a given libc implementation on a platform - -include stdint.h for uint32_h definition - -Signed-off-by: Khem Raj <[email protected]> ---- -Upstream-Status: Pending - - nss-myhostname.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/nss-myhostname.c b/nss-myhostname.c -index 293166c..6f287f5 100644 ---- a/nss-myhostname.c -+++ b/nss-myhostname.c -@@ -21,7 +21,27 @@ - ***/ - - #include <limits.h> -+#include <stdint.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 -+}; -+/* Data structure used for the 'gethostbyname4_r' function. */ -+struct gaih_addrtuple -+ { -+ struct gaih_addrtuple *next; -+ char *name; -+ int family; -+ uint32_t addr[4]; -+ uint32_t scopeid; -+ }; -+#endif - #include <sys/types.h> - #include <netdb.h> - #include <errno.h> --- -2.7.0 -meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb +2
-1@@ -7,7 +7,6 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${PV}.tar.gz \ - file://0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch \ " SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f"@@ -15,6 +14,8 @@ SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67 inherit autotools distro_features_check +COMPATIBLE_HOST_libc-musl = 'null' + # The systemd has its own copy of nss-myhostname CONFLICT_DISTRO_FEATURES = "systemd"