summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2017-03-04 11:24:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-08 11:52:56 +0000
commitc675b5dbe5238240b663fba70467175c96f5a6f4 (patch)
tree880eec551f8edcd87e4304f692112511d4d25939
parent1df119cd064ee7daaae87d9cb5f3c476014e6b2e (diff)
downloadpoky-c675b5dbe5238240b663fba70467175c96f5a6f4.tar.gz
apr: fix rss+perf+gold failure on do_compile_ptest_base
Was detected in Martin's world build (From OE-Core rev: ef9dfc361e5e97157d05dfeaf67a3e872648d372) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch50
-rw-r--r--meta/recipes-support/apr/apr_1.5.2.bb1
2 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch b/meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch
new file mode 100644
index 0000000000..7d0dddc530
--- /dev/null
+++ b/meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch
@@ -0,0 +1,50 @@
1From 94d1ca0266a0f9c0446f1299b54f752e87b8a695 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 3 Mar 2017 22:24:17 +0100
4Subject: [PATCH] explicitly link libapr against phtread to make gold happy on
5 test
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_init'
11| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_settype'
12| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_destroy'
13| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutex_trylock'
14| ../.libs/libapr-1.so: error: undefined reference to 'pthread_attr_setstacksize'
15| ../.libs/libapr-1.so: error: undefined reference to 'pthread_create'
16| ../.libs/libapr-1.so: error: undefined reference to 'pthread_join'
17| ../.libs/libapr-1.so: error: undefined reference to 'pthread_detach'
18| ../.libs/libapr-1.so: error: undefined reference to 'pthread_sigmask'
19| ../.libs/libapr-1.so: error: undefined reference to 'pthread_once'
20| ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_create'
21| ../.libs/libapr-1.so: error: undefined reference to 'pthread_getspecific'
22| ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_delete'
23| ../.libs/libapr-1.so: error: undefined reference to 'pthread_setspecific'
24| collect2: error: ld returned 1 exit status
25| Makefile:114: recipe for target 'globalmutexchild' failed
26| make[1]: *** [globalmutexchild] Error 1
27| make[1]: Leaving directory '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/apr/1.5.2-r0/apr-1.5.2/test'
28
29Upstream-Status: Pending
30
31Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
32---
33 configure.in | 1 +
34 1 file changed, 1 insertion(+)
35
36diff --git a/configure.in b/configure.in
37index 5b19940..cdf4d58 100644
38--- a/configure.in
39+++ b/configure.in
40@@ -766,6 +766,7 @@ else
41 APR_PTHREADS_CHECK_RESTORE ] )
42 fi
43 if test "$pthreadh" = "1"; then
44+ APR_ADDTO(LIBS,[-lpthread])
45 APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
46 APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
47 APR_CHECK_PTHREAD_RECURSIVE_MUTEX
48--
492.9.3
50
diff --git a/meta/recipes-support/apr/apr_1.5.2.bb b/meta/recipes-support/apr/apr_1.5.2.bb
index 079f8cd654..992b561fb8 100644
--- a/meta/recipes-support/apr/apr_1.5.2.bb
+++ b/meta/recipes-support/apr/apr_1.5.2.bb
@@ -18,6 +18,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
18 file://Fix-packet-discards-HTTP-redirect.patch \ 18 file://Fix-packet-discards-HTTP-redirect.patch \
19 file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ 19 file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \
20 file://0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ 20 file://0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \
21 file://0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch \
21" 22"
22 23
23SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa" 24SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa"