summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/libxml/libxml2/0001-threads-Define-pthread-definitions-for-glibc-complia.patch32
-rw-r--r--meta/recipes-core/libxml/libxml2_2.9.2.bb4
2 files changed, 35 insertions, 1 deletions
diff --git a/meta/recipes-core/libxml/libxml2/0001-threads-Define-pthread-definitions-for-glibc-complia.patch b/meta/recipes-core/libxml/libxml2/0001-threads-Define-pthread-definitions-for-glibc-complia.patch
new file mode 100644
index 0000000000..c653a81af3
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/0001-threads-Define-pthread-definitions-for-glibc-complia.patch
@@ -0,0 +1,32 @@
1From 6750cc564a17c812555cca587660240ccffaaed3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 4 Apr 2015 08:50:40 -0700
4Subject: [PATCH] threads: Define pthread* definitions for glibc compliant libs
5
6This code is assuming glibc but not explicitly saying it
7so lets make it so. Fixes following on musl
8
9threads.c:80:27: error: macro "pthread_equal" requires 2 arguments, but
10only 1 given
11| extern int pthread_equal ()
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15Upstream-Status: Pending
16---
17 threads.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20Index: libxml2-2.9.2/threads.c
21===================================================================
22--- libxml2-2.9.2.orig/threads.c
23+++ libxml2-2.9.2/threads.c
24@@ -47,7 +47,7 @@
25 #ifdef HAVE_PTHREAD_H
26
27 static int libxml_is_threaded = -1;
28-#ifdef __GNUC__
29+#if defined(__GNUC__) && defined(__GLIBC__)
30 #ifdef linux
31 #if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3)
32 extern int pthread_once (pthread_once_t *__once_control,
diff --git a/meta/recipes-core/libxml/libxml2_2.9.2.bb b/meta/recipes-core/libxml/libxml2_2.9.2.bb
index 1affff12ae..79a395cea1 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.2.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.2.bb
@@ -1,7 +1,9 @@
1require libxml2.inc 1require libxml2.inc
2 2
3SRC_URI += "http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar \ 3SRC_URI += "http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar \
4 file://72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch" 4 file://72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch \
5 file://0001-threads-Define-pthread-definitions-for-glibc-complia.patch \
6 "
5 7
6SRC_URI[libtar.md5sum] = "9e6a9aca9d155737868b3dc5fd82f788" 8SRC_URI[libtar.md5sum] = "9e6a9aca9d155737868b3dc5fd82f788"
7SRC_URI[libtar.sha256sum] = "5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc" 9SRC_URI[libtar.sha256sum] = "5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc"