diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-01-12 18:55:19 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-16 23:06:45 +0000 |
| commit | e712a31287eb830f365df456e68bc95bdacb1a4a (patch) | |
| tree | 052996b05ce0a54f1e9aa18e36f4ed45f3f6a342 /meta/recipes-support | |
| parent | 912af87805abf857f1d4d3ba2cdbb3ae1f26a637 (diff) | |
| download | openembedded-core-contrib-e712a31287eb830f365df456e68bc95bdacb1a4a.tar.gz | |
apr-util: fix B != S
And bump PR to avoid:
x86_64-linux-libtool: error: 'dbm/apr_dbm_gdbm.la' is not a valid libtool archive
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/apr/apr-util_1.5.4.bb | 17 |
1 files changed, 10 insertions, 7 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 1cd47b1468..ac01b63ecd 100644 --- a/meta/recipes-support/apr/apr-util_1.5.4.bb +++ b/meta/recipes-support/apr/apr-util_1.5.4.bb @@ -28,22 +28,25 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --with-expat=${STAGING_DIR_HOST}${prefix}" -inherit autotools-brokensep lib_package binconfig +inherit autotools lib_package binconfig + +PR = "r1" OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" do_configure_append() { if [ "${CLASSOVERRIDE}" = "class-target" ]; then - cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk + cp ${STAGING_DATADIR}/apr/apr_rules.mk ${B}/build/rules.mk fi } do_configure_prepend_class-native() { - cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk + mkdir ${B}/build + cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${B}/build/rules.mk } do_configure_append_class-native() { - sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk + sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk # sometimes there isn't SHELL - sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk + sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk } FILES_${PN} += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so" @@ -54,7 +57,7 @@ FILES_${PN}-staticdev += "${libdir}/apr-util-1/apr_dbm_gdbm.a" inherit ptest do_compile_ptest() { - cd ${S}/test + cd ${B}/test oe_runmake } @@ -62,6 +65,6 @@ do_install_ptest() { t=${D}${PTEST_PATH}/test mkdir $t for i in testall data; do \ - cp -r ${S}/test/$i $t; \ + cp -r ${B}/test/$i $t; \ done } |