summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-03-05 00:03:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-07 00:11:38 +0000
commitfb0c3c59c09905ba1a20a2b0c6297ae923667f7d (patch)
tree5456f5c8f6822341b58aaf96c80ec65870962e7f /meta
parent37f5fb944a0b282a1eec3ee6451fa00dfa64b7e9 (diff)
downloadpoky-fb0c3c59c09905ba1a20a2b0c6297ae923667f7d.tar.gz
nspr: Fix build regression on musl from last upgrade
This patch is no longer required as upstreamed has fixed the problem in more comprehensive way (From OE-Core rev: 3eb83b880e66fff0e715e79546ed98d9818390b5) 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.12.bb11
2 files changed, 3 insertions, 43 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
deleted file mode 100644
index 5b17355539..0000000000
--- a/meta/recipes-support/nspr/nspr/0001-Remove-the-check-for-LINUX-glibc-case.patch
+++ /dev/null
@@ -1,35 +0,0 @@
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.12.bb b/meta/recipes-support/nspr/nspr_4.12.bb
index 2fd801f0fb..168341bc05 100644
--- a/meta/recipes-support/nspr/nspr_4.12.bb
+++ b/meta/recipes-support/nspr/nspr_4.12.bb
@@ -9,20 +9,15 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz
9 file://remove-rpath-from-tests.patch \ 9 file://remove-rpath-from-tests.patch \
10 file://fix-build-on-x86_64.patch \ 10 file://fix-build-on-x86_64.patch \
11 file://remove-srcdir-from-configure-in.patch \ 11 file://remove-srcdir-from-configure-in.patch \
12 file://0002-Add-nios2-support.patch \ 12 file://0002-Add-nios2-support.patch \
13 " 13 file://nspr.pc.in \
14 14"
15SRC_URI += "file://nspr.pc.in"
16 15
17CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ 16CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \
18 -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ 17 -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \
19 -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ 18 -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \
20 -D_PR_INET6_PROBE'" 19 -D_PR_INET6_PROBE'"
21 20
22SRC_URI_append_libc-musl = "\
23 file://0001-Remove-the-check-for-LINUX-glibc-case.patch \
24 "
25
26UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" 21UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
27UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" 22UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"
28 23