[PATCH 1/2] apr: Allow use in SDK

[PATCH 1/2] apr: Allow use in SDK

[Timo Mueller]

From: Timo Mueller <timo.mueller@bmw-carit.de>

This adds 'nativesdk' in the BBCLASSEXTEND.

Signed-off-by: Timo Mueller <timo.mueller@bmw-carit.de>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
---
 meta/recipes-support/apr/apr_1.5.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/apr/apr_1.5.1.bb b/meta/recipes-support/apr/apr_1.5.1.bb
index a27b233..985ef67 100644
--- a/meta/recipes-support/apr/apr_1.5.1.bb
+++ b/meta/recipes-support/apr/apr_1.5.1.bb
@@ -7,7 +7,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \
                     file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
            file://configure_fixes.patch \
-- 
2.1.0

[PATCH 2/2] apr-util: Allow use in SDK

[Timo Mueller]

From: Timo Mueller <timo.mueller@bmw-carit.de>

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.

Signed-off-by: Timo Mueller <timo.mueller@bmw-carit.de>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
---
 meta/recipes-support/apr/apr-util_1.5.4.bb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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 1cd47b1..49d4d6c 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 \
@@ -46,6 +46,17 @@ do_configure_append_class-native() {
 	sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/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/*"
-- 
2.1.0

Re: [PATCH 2/2] apr-util: Allow use in SDK

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

Hi Timo,

On 2 February 2015 at 14:03, Timo Mueller <mail@timomueller.eu> wrote:

> From: Timo Mueller <timo.mueller@bmw-carit.de>
>
> This adds 'nativesdk' in the BBCLASSEXTEND.
>

This doesn't apply to master, can you rebase?

Ross

[-- Attachment #2: Type: text/html, Size: 745 bytes --]

Re: [PATCH 2/2] apr-util: Allow use in SDK

[Timo Mueller]

Hi Ross,

Burton, Ross wrote on 02/02/2015 04:19 PM:
> Hi Timo,
>
> On 2 February 2015 at 14:03, Timo Mueller <mail@timomueller.eu> wrote:
>
>> From: Timo Mueller <timo.mueller@bmw-carit.de>
>>
>> This adds 'nativesdk' in the BBCLASSEXTEND.
>>
> This doesn't apply to master, can you rebase?

Sorry, my bad. I'll do so and send a v2 asap.
>
> Ross
>
Regards,
Timo