aboutsummaryrefslogtreecommitdiffstats
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-06 23:52:57 +0000
commit3eb83b880e66fff0e715e79546ed98d9818390b5 (patch)
tree0aa414d65d2df6b38cfa467ea4ebf3eec75c7c1c /meta
parent1490caa07d72af81c7e515e4ff7b4905da840d7d (diff)
downloadopenembedded-core-contrib-3eb83b880e66fff0e715e79546ed98d9818390b5.tar.gz
openembedded-core-contrib-3eb83b880e66fff0e715e79546ed98d9818390b5.tar.bz2
openembedded-core-contrib-3eb83b880e66fff0e715e79546ed98d9818390b5.zip
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 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 @@
-From 9b9c95e0390395c7e9ad24a882deb87a50846059 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 8 Aug 2015 17:10:34 -0700
-Subject: [PATCH] Remove the check for LINUX == glibc case
-
-Here it does not consider the case where musl can be an options it does
-consider the bionic case with !defined(ANDROID) but musl does not define
-and musl'ism defines like that
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- pr/src/misc/prnetdb.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c
-index b86248f..dc83a56 100644
---- a/pr/src/misc/prnetdb.c
-+++ b/pr/src/misc/prnetdb.c
-@@ -61,10 +61,7 @@ PRLock *_pr_dnsLock = NULL;
- #define _PR_HAVE_GETPROTO_R_POINTER
- #endif
-
--#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
-- || (defined(LINUX) && defined(_REENTRANT) \
-- && !(defined(__GLIBC__) && __GLIBC__ >= 2) \
-- && !defined(ANDROID))
-+#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT))
- #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_GETPROTO_R_POINTER
- #endif
---
-2.1.4
-
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
file://remove-rpath-from-tests.patch \
file://fix-build-on-x86_64.patch \
file://remove-srcdir-from-configure-in.patch \
- file://0002-Add-nios2-support.patch \
- "
-
-SRC_URI += "file://nspr.pc.in"
+ file://0002-Add-nios2-support.patch \
+ file://nspr.pc.in \
+"
CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \
-D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \
-D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \
-D_PR_INET6_PROBE'"
-SRC_URI_append_libc-musl = "\
- file://0001-Remove-the-check-for-LINUX-glibc-case.patch \
- "
-
UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"