summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-18 20:21:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-21 12:56:33 +0100
commitca3de9df8affe61bcb5b8d17139f1faa8d018c77 (patch)
tree9f7a88c68ced942f3c7b87b7d6010c2591431183 /meta
parente42d45925d4a6be1d7cb240c0b630c7529d5a7cc (diff)
downloadpoky-ca3de9df8affe61bcb5b8d17139f1faa8d018c77.tar.gz
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. (From OE-Core rev: ec528bd5edf5f85abdaef25ff73a282f5c6ce2c4) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch53
-rw-r--r--meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb3
2 files changed, 2 insertions, 54 deletions
diff --git a/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch b/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch
deleted file mode 100644
index 82f25743af..0000000000
--- a/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From d1345871b992f9a055c968963967e728da1a7ffb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Jan 2016 20:29:06 +0000
4Subject: [PATCH] nss-myhostname: Check for nss.h presense before use
5
6We do not have nss.h on musl e.g. and configury is already checking for
7nss.h presence, use this to define needed data structures if nss.h is
8missing on a given libc implementation on a platform
9
10include stdint.h for uint32_h definition
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14Upstream-Status: Pending
15
16 nss-myhostname.c | 20 ++++++++++++++++++++
17 1 file changed, 20 insertions(+)
18
19diff --git a/nss-myhostname.c b/nss-myhostname.c
20index 293166c..6f287f5 100644
21--- a/nss-myhostname.c
22+++ b/nss-myhostname.c
23@@ -21,7 +21,27 @@
24 ***/
25
26 #include <limits.h>
27+#include <stdint.h>
28+#ifdef HAVE_NSS_H
29 #include <nss.h>
30+#else
31+enum nss_status {
32+ NSS_STATUS_TRYAGAIN = -2,
33+ NSS_STATUS_UNAVAIL,
34+ NSS_STATUS_NOTFOUND,
35+ NSS_STATUS_SUCCESS,
36+ NSS_STATUS_RETURN
37+};
38+/* Data structure used for the 'gethostbyname4_r' function. */
39+struct gaih_addrtuple
40+ {
41+ struct gaih_addrtuple *next;
42+ char *name;
43+ int family;
44+ uint32_t addr[4];
45+ uint32_t scopeid;
46+ };
47+#endif
48 #include <sys/types.h>
49 #include <netdb.h>
50 #include <errno.h>
51--
522.7.0
53
diff --git a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
index de5b7cf598..244d9e204e 100644
--- a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
+++ b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
@@ -7,7 +7,6 @@ LICENSE = "LGPLv2.1"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1"
8 8
9SRC_URI = "http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${PV}.tar.gz \ 9SRC_URI = "http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${PV}.tar.gz \
10 file://0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch \
11 " 10 "
12 11
13SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f" 12SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f"
@@ -15,6 +14,8 @@ SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67
15 14
16inherit autotools distro_features_check 15inherit autotools distro_features_check
17 16
17COMPATIBLE_HOST_libc-musl = 'null'
18
18# The systemd has its own copy of nss-myhostname 19# The systemd has its own copy of nss-myhostname
19CONFLICT_DISTRO_FEATURES = "systemd" 20CONFLICT_DISTRO_FEATURES = "systemd"
20 21