Patchwork [1/3] nasm: fix issue with repeat configure

login
register
mail settings
Submitter Nitin A Kamble
Date March 30, 2012, 10:28 p.m.
Message ID <512eae1ae0678b247076db900304725702acc91e.1333145263.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/24953/
State Accepted
Commit 2d26b1a4f83a635f96072589289a389675abb305
Headers show

Comments

Nitin A Kamble - March 30, 2012, 10:28 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

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>
---
 meta/recipes-devtools/nasm/nasm_2.07.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Richard Purdie - March 31, 2012, 5:02 p.m.
On Fri, 2012-03-30 at 15:28 -0700, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
> 
> 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>
> ---
>  meta/recipes-devtools/nasm/nasm_2.07.bb |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-devtools/nasm/nasm_2.07.bb b/meta/recipes-devtools/nasm/nasm_2.07.bb
index 9b75496..fc2d531 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