diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-03-30 15:52:04 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-31 17:36:54 +0100 |
| commit | 2d26b1a4f83a635f96072589289a389675abb305 (patch) | |
| tree | c03d6f58775cfe1dc0f0d9e7e06883b1cd166313 /meta/recipes-devtools/nasm | |
| parent | 36c0d1fdc71f9c63699049911aeddb07a746ca4a (diff) | |
| download | openembedded-core-2d26b1a4f83a635f96072589289a389675abb305.tar.gz openembedded-core-2d26b1a4f83a635f96072589289a389675abb305.tar.bz2 openembedded-core-2d26b1a4f83a635f96072589289a389675abb305.zip | |
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
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/nasm')
| -rw-r--r-- | meta/recipes-devtools/nasm/nasm_2.07.bb | 8 |
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 inherit autotools -do_patch_fixaclocal () { - mv aclocal.m4 acinclude.m4 +do_configure_prepend () { + if [ -f aclocal.m4 ] && [ ! -f acinclude.m4 ]; then + mv aclocal.m4 acinclude.m4 + fi } -addtask do_patch_fixaclocal after do_patch before do_configure - do_install() { install -d ${D}${bindir} install -d ${D}${mandir}/man1 |