From c425c3804cabafaa7ff8435f56b82349699afffc Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 20 Jun 2011 19:02:40 -0500 Subject: nasm: Fix aclocal The mv of aclocal.m4 can only occur once, or it will fail. On a re-run of configure this will fail. (From OE-Core rev: 1e232db4f6e90577f75efabd279b6980277b9547) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/nasm/nasm_2.07.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/nasm/nasm_2.07.bb b/meta/recipes-devtools/nasm/nasm_2.07.bb index 69e3b7bfb4..9b75496f95 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 -- cgit v1.2.3-54-g00ecf