Patchwork vblade: Fix GNU_HASH QA error

login
register
mail settings
Submitter Mike Stirling
Date July 22, 2011, 9:47 a.m.
Message ID <1311328049-22455-1-git-send-email-mstirling@ad-holdings.co.uk>
Download mbox | patch
Permalink /patch/8327/
State New, archived
Headers show

Comments

Mike Stirling - July 22, 2011, 9:47 a.m.
From: Mike Stirling <mstirling@chipwrights.com>

Build fails QA with (at least) external-toolchain-csl.  Fix patches makefile to pass OE's LDFLAGS to linker.

Upstream-Status: Pending - issue still exists in vblade-20

Signed-off-by: Mike Stirling <mstirling@chipwrights.com>
---
 recipes/vblade/files/ldflags.patch |   12 ++++++++++++
 recipes/vblade/vblade_19.bb        |    5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 recipes/vblade/files/ldflags.patch

Patch

diff --git a/recipes/vblade/files/ldflags.patch b/recipes/vblade/files/ldflags.patch
new file mode 100644
index 0000000..3350513
--- /dev/null
+++ b/recipes/vblade/files/ldflags.patch
@@ -0,0 +1,12 @@ 
+diff -urN vblade-19.orig/makefile vblade-19/makefile
+--- vblade-19.orig/makefile	2011-07-20 15:45:43.851538824 +0100
++++ vblade-19/makefile	2011-07-20 15:46:26.863358466 +0100
+@@ -11,7 +11,7 @@
+ O=aoe.o bpf.o ${PLATFORM}.o ata.o
+ 
+ vblade: $O
+-	${CC} -o vblade $O
++	${CC} ${LDFLAGS} -o vblade $O
+ 
+ aoe.o : aoe.c config.h dat.h fns.h makefile
+ 	${CC} ${CFLAGS} -c $<
diff --git a/recipes/vblade/vblade_19.bb b/recipes/vblade/vblade_19.bb
index f100a46..7b3504a 100644
--- a/recipes/vblade/vblade_19.bb
+++ b/recipes/vblade/vblade_19.bb
@@ -1,10 +1,11 @@ 
 DESCRIPTION = "Virtual EtherDrive blade AoE target"
 SECTION = "console/network"
-PR = "r1"
+PR = "r2"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/aoetools/${PN}-${PV}.tgz \
-	   file://cross.patch"
+	   file://cross.patch \
+	   file://ldflags.patch"
 
 inherit autotools