summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-08 08:57:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:29 +0000
commitb2aca0936347fb714662142031eb0a2d5f8a0744 (patch)
tree6377978e8665a16b71410bba620f1ad5053bb76a /meta
parentc0976fc7257c7cb7fb2b024da882b601651905db (diff)
downloadpoky-b2aca0936347fb714662142031eb0a2d5f8a0744.tar.gz
nspr: Drop older glibc code
This was not only getting included for libc5 but also for not-glibc libc implementations e.g. musl (From OE-Core rev: 9d0fed7d3b2e70bc5d6bc2b0e1cc38166df3f0d2) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/nspr/nspr/0001-Remove-the-check-for-LINUX-glibc-case.patch35
-rw-r--r--meta/recipes-support/nspr/nspr_4.11.bb9
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-support/nspr/nspr/0001-Remove-the-check-for-LINUX-glibc-case.patch b/meta/recipes-support/nspr/nspr/0001-Remove-the-check-for-LINUX-glibc-case.patch
new file mode 100644
index 0000000000..5b17355539
--- /dev/null
+++ b/meta/recipes-support/nspr/nspr/0001-Remove-the-check-for-LINUX-glibc-case.patch
@@ -0,0 +1,35 @@
1From 9b9c95e0390395c7e9ad24a882deb87a50846059 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 8 Aug 2015 17:10:34 -0700
4Subject: [PATCH] Remove the check for LINUX == glibc case
5
6Here it does not consider the case where musl can be an options it does
7consider the bionic case with !defined(ANDROID) but musl does not define
8and musl'ism defines like that
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Pending
13
14 pr/src/misc/prnetdb.c | 5 +----
15 1 file changed, 1 insertion(+), 4 deletions(-)
16
17diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c
18index b86248f..dc83a56 100644
19--- a/pr/src/misc/prnetdb.c
20+++ b/pr/src/misc/prnetdb.c
21@@ -61,10 +61,7 @@ PRLock *_pr_dnsLock = NULL;
22 #define _PR_HAVE_GETPROTO_R_POINTER
23 #endif
24
25-#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
26- || (defined(LINUX) && defined(_REENTRANT) \
27- && !(defined(__GLIBC__) && __GLIBC__ >= 2) \
28- && !defined(ANDROID))
29+#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT))
30 #define _PR_HAVE_GETPROTO_R
31 #define _PR_HAVE_GETPROTO_R_POINTER
32 #endif
33--
342.1.4
35
diff --git a/meta/recipes-support/nspr/nspr_4.11.bb b/meta/recipes-support/nspr/nspr_4.11.bb
index 3048641c98..3dabcb6345 100644
--- a/meta/recipes-support/nspr/nspr_4.11.bb
+++ b/meta/recipes-support/nspr/nspr_4.11.bb
@@ -13,6 +13,15 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz
13 13
14SRC_URI += "file://nspr.pc.in" 14SRC_URI += "file://nspr.pc.in"
15 15
16CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \
17 -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \
18 -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \
19 -D_PR_INET6_PROBE'"
20
21SRC_URI_append_libc-musl = "\
22 file://0001-Remove-the-check-for-LINUX-glibc-case.patch \
23 "
24
16UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" 25UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
17UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" 26UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"
18 27