summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorTimo Mueller <timo.mueller@bmw-carit.de>2015-02-03 13:21:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-08 08:00:24 +0000
commit5fcb217f815a56b442766d50dda0568fff9faa29 (patch)
treedf5769d9bb75ae10f869fb97ce11c3239142f6a8 /meta/recipes-support
parent6b19a93f3814185c46c42bcceb3a9d80e7506f16 (diff)
downloadast2050-yocto-poky-5fcb217f815a56b442766d50dda0568fff9faa29.zip
ast2050-yocto-poky-5fcb217f815a56b442766d50dda0568fff9faa29.tar.gz
apr-util: Allow use in SDK
This adds 'nativesdk' in the BBCLASSEXTEND. Building apr-util for the SDK requires that some paths in the rules.mk file are fixed to point to the actual enviroment. These include pointing the apr configuration variables to the actual apr builddir and correcting the name of the libtool. (From OE-Core rev: 4595e4832418afc651300c88ad2b835f0aedd8bc) Signed-off-by: Timo Mueller <timo.mueller@bmw-carit.de> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/apr/apr-util_1.5.4.bb13
1 files changed, 12 insertions, 1 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 ac01b63..6a14d14 100644
--- a/meta/recipes-support/apr/apr-util_1.5.4.bb
+++ b/meta/recipes-support/apr/apr-util_1.5.4.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://apr.apache.org/"
SECTION = "libs"
DEPENDS = "apr expat gdbm"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \
@@ -49,6 +49,17 @@ do_configure_append_class-native() {
sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk
}
+do_configure_prepend_class-nativesdk() {
+ cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
+}
+
+do_configure_append_class-nativesdk() {
+ sed -i "s#\(apr_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk
+ sed -i "s#\(apr_builders\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk
+ sed -i "s#\(top_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk
+ sed -i "s#\(LIBTOOL=\$(apr_builddir)\).*#\1/libtool#" ${S}/build/rules.mk
+}
+
FILES_${PN} += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so"
FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/apr_dbm_gdbm.so* ${libdir}/apr-util-1/apr_dbm_gdbm.la"
FILES_${PN}-dbg += "${libdir}/apr-util-1/.debug/*"
OpenPOWER on IntegriCloud