summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/apr
diff options
context:
space:
mode:
authorIoan-Adrian Ratiu <adrian.ratiu@ni.com>2016-02-04 14:32:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:02 +0000
commitd8d2f573f09b4e4acee924dadce2bcd9b594e94b (patch)
treef7d79212a28a61e058bafd24313b73ed3b31e952 /meta/recipes-support/apr
parent77cfa2bcd797ec0b4f9d4c5ae8346efb07a67165 (diff)
downloadpoky-d8d2f573f09b4e4acee924dadce2bcd9b594e94b.tar.gz
apr-util: fix loadable module packaging
A new QA check was introduced by 47d38d4d86ec6a which catches recipes which install loadable modules (*.so) inside -dev packages instead of symlinks. Install apr-util's modules into ${PN} and also skip the QA check [dev-so] because it is the reverse of the check introduced by 47d38d4d86ec6a (thus if a recipe passes one it fails the other). (From OE-Core rev: ef82fb5aff4ca3204b40cdf6a074d9711e543af2) Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/apr')
-rw-r--r--meta/recipes-support/apr/apr-util_1.5.4.bb9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-support/apr/apr-util_1.5.4.bb b/meta/recipes-support/apr/apr-util_1.5.4.bb
index 6856db9b51..381daaddf3 100644
--- a/meta/recipes-support/apr/apr-util_1.5.4.bb
+++ b/meta/recipes-support/apr/apr-util_1.5.4.bb
@@ -66,9 +66,12 @@ do_install_append_class-target() {
66 -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config 66 -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config
67} 67}
68 68
69FILES_${PN} += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so" 69#files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN}
70FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/apr_dbm_gdbm.so* ${libdir}/apr-util-1/apr_dbm_gdbm.la" 70FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}"
71FILES_${PN}-staticdev += "${libdir}/apr-util-1/apr_dbm_gdbm.a" 71FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/*.la"
72FILES_${PN}-staticdev += "${libdir}/apr-util-1/*.a"
73
74INSANE_SKIP_${PN} += "dev-so"
72 75
73inherit ptest 76inherit ptest
74 77