Patchwork [meta-oe,v2] enca: fix S!=B failure

login
register
mail settings
Submitter Tim Orling
Date May 29, 2014, 3:47 a.m.
Message ID <1401335237-19402-1-git-send-email-ticotimo@gmail.com>
Download mbox | patch
Permalink /patch/72927/
State New, archived
Headers show

Comments

Tim Orling - May 29, 2014, 3:47 a.m.
From: Tim Orling <TicoTimo@gmail.com>

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@gmail.com>
---
 meta-oe/recipes-support/enca/enca_1.9.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

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
 }