[oe-commits] Roy Li : tftp-hpa: fix a build failure

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 43da512cc3a5860c2e274225e73bc721d6d97918
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=43da512cc3a5860c2e274225e73bc721d6d97918

Author: Roy Li <rongqing.li at windriver.com>
Date:   Tue Jun 24 11:11:21 2014 +0800

tftp-hpa: fix a build failure

AR is defined as "ar cq" in MCONFIG.in, then "cq" is no longer needed in
Makefile of common and libs subdir.
	#grep AR MCONFIG.in
	AR	= ar cq
	#

	#grep AR common/Makefile
	$(AR) $(LIB) $(OBJS)
	#
But MCONFIG maybe not able to be generated by MCONFIG.in, common/Makefile
allows this condition [Note the - before include]
	#grep MCONFIG common/Makefile
	-include ../MCONFIG
	#
then AR from building environment is used, but it not included the parameter
"cq", and lead to below error, so add the "cq" to AR to fix this issue.
	i586-wrs-linux-ar libcommon.a tftpsubs.
	i586-wrs-linux-ar: two different operation options specified

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>

---

 meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
index 366a4e9..1951747 100644
--- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
+++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
@@ -32,6 +32,8 @@ SRC_URI[sha256sum] = "0a9f88d4c1c02687b4853b02ab5dd8779d4de4ffdb9b2e5c9332841304
 
 inherit autotools-brokensep update-rc.d update-alternatives
 
+export AR = "${HOST_PREFIX}ar cq"
+
 EXTRA_OECONF += "--disable-option-checking"
 
 # configure.in has errors