[oe-commits] Tim Orling : enca: fix S!=B failure
git at git.openembedded.org
git at git.openembedded.org
Tue Jun 10 10:44:04 UTC 2014
Module: meta-openembedded.git
Branch: master-next
Commit: ff7b1818968f8346d1907f66432e6b1fd34ef96e
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=ff7b1818968f8346d1907f66432e6b1fd34ef96e
Author: Tim Orling <TicoTimo at gmail.com>
Date: Wed May 28 20:47:17 2014 -0700
enca: fix S!=B failure
Point tools to the right paths:
* ${S}/configure.ac in do_configure_prepare()
* ${B}/Makefile in do_configure_append()
* cd ${B} in do_compile()
Signed-off-by: Tim Orling <TicoTimo at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-support/enca/enca_1.9.bb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-support/enca/enca_1.9.bb b/meta-oe/recipes-support/enca/enca_1.9.bb
index e65a143..ea38946 100644
--- a/meta-oe/recipes-support/enca/enca_1.9.bb
+++ b/meta-oe/recipes-support/enca/enca_1.9.bb
@@ -20,17 +20,17 @@ EXTRA_OECONF = "--with-libiconv-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
do_configure_prepend() {
# remove failing test which checks for something that isn't even used
- sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' configure.ac
+ sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' ${S}/configure.ac
}
do_configure_append() {
- sed -i s:-I/usr/include::g Makefile
- sed -i s:-I/usr/include::g */Makefile
+ sed -i s:-I/usr/include::g ${B}/Makefile
+ sed -i s:-I/usr/include::g ${B}/*/Makefile
}
do_compile() {
cd ${S}/tools && ${BUILD_CC} -o make_hash make_hash.c
- cd ..
+ cd ${B}
oe_runmake
}
More information about the Openembedded-commits
mailing list