summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-03-30 15:52:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-31 17:59:09 +0100
commit6302003eb4c2eeb12c157754cc62c7ab8abe326e (patch)
treec7822cfbd8b1696af9e1bd667af3c5e28eada07d
parent15e797ccdb982236ffc0665b8e209b348a39399b (diff)
downloadpoky-6302003eb4c2eeb12c157754cc62c7ab8abe326e.tar.gz
nasm: fix issue with repeat configure
This Fixes bug: [YOCTO #2176] This fixes the following issue as mentioned in the bug: If nasm-native has to be rebuilt (due to a signature change) it will fail: | checking for a BSD-compatible install... /usr/bin/install -c | /media/large/tmp/work/x86_64-linux/nasm-native-2.07-r1/nasm-2.07/configure: line 4261: syntax error near unexpected token `-W' | /media/large/tmp/work/x86_64-linux/nasm-native-2.07-r1/nasm-2.07/configure: line 4261: `PA_ADD_CFLAGS(-W)' | ERROR: oe_runconf failed NOTE: package nasm-native-2.07-r1: task do_configure: Failed The failure appears to be caused by do_patch_fixaclocal being run a second time (From OE-Core rev: 2d26b1a4f83a635f96072589289a389675abb305) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/nasm/nasm_2.07.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/nasm/nasm_2.07.bb b/meta/recipes-devtools/nasm/nasm_2.07.bb
index 9b75496f95..fc2d5310c0 100644
--- a/meta/recipes-devtools/nasm/nasm_2.07.bb
+++ b/meta/recipes-devtools/nasm/nasm_2.07.bb
@@ -13,12 +13,12 @@ SRC_URI[sha256sum] = "ac70ee451c73d742c9ff830502e5f8b1f648b2abffa8fd00944243283b
13 13
14inherit autotools 14inherit autotools
15 15
16do_patch_fixaclocal () { 16do_configure_prepend () {
17 mv aclocal.m4 acinclude.m4 17 if [ -f aclocal.m4 ] && [ ! -f acinclude.m4 ]; then
18 mv aclocal.m4 acinclude.m4
19 fi
18} 20}
19 21
20addtask do_patch_fixaclocal after do_patch before do_configure
21
22do_install() { 22do_install() {
23 install -d ${D}${bindir} 23 install -d ${D}${bindir}
24 install -d ${D}${mandir}/man1 24 install -d ${D}${mandir}/man1