diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-03-05 00:03:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-07 00:11:38 +0000 |
commit | fb0c3c59c09905ba1a20a2b0c6297ae923667f7d (patch) | |
tree | 5456f5c8f6822341b58aaf96c80ec65870962e7f /meta/recipes-support/nspr/nspr | |
parent | 37f5fb944a0b282a1eec3ee6451fa00dfa64b7e9 (diff) | |
download | poky-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/recipes-support/nspr/nspr')
-rw-r--r-- | meta/recipes-support/nspr/nspr/0001-Remove-the-check-for-LINUX-glibc-case.patch | 35 |
1 files changed, 0 insertions, 35 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 @@ | |||
1 | From 9b9c95e0390395c7e9ad24a882deb87a50846059 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 8 Aug 2015 17:10:34 -0700 | ||
4 | Subject: [PATCH] Remove the check for LINUX == glibc case | ||
5 | |||
6 | Here it does not consider the case where musl can be an options it does | ||
7 | consider the bionic case with !defined(ANDROID) but musl does not define | ||
8 | and musl'ism defines like that | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | Upstream-Status: Pending | ||
13 | |||
14 | pr/src/misc/prnetdb.c | 5 +---- | ||
15 | 1 file changed, 1 insertion(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c | ||
18 | index 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 | -- | ||
34 | 2.1.4 | ||
35 | |||