summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-06-20 19:02:40 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 12:07:31 +0100
commitc425c3804cabafaa7ff8435f56b82349699afffc (patch)
tree3fa48fed8f95e208e402e8b7bd2861d88bf09d4b /meta
parent9633eebe1d0f487164ac0da9787e224bcb497e7f (diff)
downloadpoky-c425c3804cabafaa7ff8435f56b82349699afffc.tar.gz
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 <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/nasm/nasm_2.07.bb6
1 files 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"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=d89d124974e487e5d64da6f1cd8acfbb" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=d89d124974e487e5d64da6f1cd8acfbb"
5COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)' 5COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
6 6
7PR = "r0" 7PR = "r1"
8 8
9SRC_URI = "${SOURCEFORGE_MIRROR}/nasm/nasm-${PV}.tar.bz2 " 9SRC_URI = "${SOURCEFORGE_MIRROR}/nasm/nasm-${PV}.tar.bz2 "
10 10
@@ -13,10 +13,12 @@ SRC_URI[sha256sum] = "ac70ee451c73d742c9ff830502e5f8b1f648b2abffa8fd00944243283b
13 13
14inherit autotools 14inherit autotools
15 15
16do_configure_prepend () { 16do_patch_fixaclocal () {
17 mv aclocal.m4 acinclude.m4 17 mv aclocal.m4 acinclude.m4
18} 18}
19 19
20addtask do_patch_fixaclocal after do_patch before do_configure
21
20do_install() { 22do_install() {
21 install -d ${D}${bindir} 23 install -d ${D}${bindir}
22 install -d ${D}${mandir}/man1 24 install -d ${D}${mandir}/man1