From ef9dfc361e5e97157d05dfeaf67a3e872648d372 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 4 Mar 2017 11:24:09 +0100 Subject: apr: fix rss+perf+gold failure on do_compile_ptest_base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Was detected in Martin's world build Signed-off-by: Andreas Müller Signed-off-by: Ross Burton --- ...link-libapr-against-phtread-to-make-gold-.patch | 50 ++++++++++++++++++++++ meta/recipes-support/apr/apr_1.5.2.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch 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 @@ +From 94d1ca0266a0f9c0446f1299b54f752e87b8a695 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 3 Mar 2017 22:24:17 +0100 +Subject: [PATCH] explicitly link libapr against phtread to make gold happy on + test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_init' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_settype' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_destroy' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutex_trylock' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_attr_setstacksize' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_create' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_join' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_detach' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_sigmask' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_once' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_create' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_getspecific' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_delete' +| ../.libs/libapr-1.so: error: undefined reference to 'pthread_setspecific' +| collect2: error: ld returned 1 exit status +| Makefile:114: recipe for target 'globalmutexchild' failed +| make[1]: *** [globalmutexchild] Error 1 +| 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' + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + configure.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.in b/configure.in +index 5b19940..cdf4d58 100644 +--- a/configure.in ++++ b/configure.in +@@ -766,6 +766,7 @@ else + APR_PTHREADS_CHECK_RESTORE ] ) + fi + if test "$pthreadh" = "1"; then ++ APR_ADDTO(LIBS,[-lpthread]) + APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS + APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG + APR_CHECK_PTHREAD_RECURSIVE_MUTEX +-- +2.9.3 + 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 \ file://Fix-packet-discards-HTTP-redirect.patch \ file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ file://0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ + file://0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ " SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa" -- cgit 1.2.3-korg