All of lore.kernel.org
 help / color / mirror / Atom feed
From: nitin.a.kamble@intel.com
To: yocto@yoctoproject.org
Subject: [PATCH 1/3] nasm: fix issue with repeat configure
Date: Fri, 30 Mar 2012 15:52:04 -0700	[thread overview]
Message-ID: <512eae1ae0678b247076db900304725702acc91e.1333145263.git.nitin.a.kamble@intel.com> (raw)
In-Reply-To: <cover.1333145263.git.nitin.a.kamble@intel.com>

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(-)

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
-- 
1.7.6.4



WARNING: multiple messages have this Message-ID (diff)
From: nitin.a.kamble@intel.com
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 1/3] nasm: fix issue with repeat configure
Date: Fri, 30 Mar 2012 15:28:22 -0700	[thread overview]
Message-ID: <512eae1ae0678b247076db900304725702acc91e.1333145263.git.nitin.a.kamble@intel.com> (raw)
In-Reply-To: <cover.1333145263.git.nitin.a.kamble@intel.com>

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(-)

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
-- 
1.7.6.4




  reply	other threads:[~2012-03-30 22:52 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-30 22:28 [PATCH 0/3] Misc Fixes nitin.a.kamble
2012-03-30 22:52 ` nitin.a.kamble
2012-03-30 22:28 ` nitin.a.kamble [this message]
2012-03-30 22:52   ` [PATCH 1/3] nasm: fix issue with repeat configure nitin.a.kamble
2012-03-31 17:02   ` Richard Purdie
2012-03-30 22:28 ` [PATCH 2/3] cross-canadian.bbclass: fix rpath for sdk executables nitin.a.kamble
2012-03-30 22:52   ` nitin.a.kamble
2012-03-31  7:57   ` Martin Jansa
2012-03-31 15:39     ` Khem Raj
2012-03-31 17:02   ` Richard Purdie
2012-03-30 22:28 ` [PATCH 3/3] poky-tiny: avoid eglibc locale packaging nitin.a.kamble
2012-03-30 22:52   ` nitin.a.kamble
2012-03-30 23:26   ` Darren Hart
2012-04-01  5:14     ` Kamble, Nitin A

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=512eae1ae0678b247076db900304725702acc91e.1333145263.git.nitin.a.kamble@intel.com \
    --to=nitin.a.kamble@intel.com \
    --cc=yocto@yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.