Patchwork [38/40] nasm: Fix aclocal

login
register
mail settings
Submitter Mark Hatle
Date June 22, 2011, 5:36 p.m.
Message ID <bdcca1c89a11a3838eca262303e2389ba13ae2a6.1308763995.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/6315/
State New, archived
Headers show

Comments

Mark Hatle - June 22, 2011, 5:36 p.m.
The mv of aclocal.m4 can only occur once, or it will fail.  On a re-run of
configure this will fail.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-devtools/nasm/nasm_2.07.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-devtools/nasm/nasm_2.07.bb b/meta/recipes-devtools/nasm/nasm_2.07.bb
index 69e3b7b..9b75496 100644
--- a/meta/recipes-devtools/nasm/nasm_2.07.bb
+++ b/meta/recipes-devtools/nasm/nasm_2.07.bb
@@ -4,7 +4,7 @@  LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d89d124974e487e5d64da6f1cd8acfbb"
 COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nasm/nasm-${PV}.tar.bz2 "
 
@@ -13,10 +13,12 @@  SRC_URI[sha256sum] = "ac70ee451c73d742c9ff830502e5f8b1f648b2abffa8fd00944243283b
 
 inherit autotools
 
-do_configure_prepend () {
+do_patch_fixaclocal () {
 	mv aclocal.m4 acinclude.m4
 }
 
+addtask do_patch_fixaclocal after do_patch before do_configure
+
 do_install() {
 	install -d ${D}${bindir}
 	install -d ${D}${mandir}/man1