Patchwork [meta-networking] tftp-hpa: fix a build failure

login
register
mail settings
Submitter rongqing.li@windriver.com
Date June 24, 2014, 3:11 a.m.
Message ID <1403579481-10494-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/74279/
State Accepted, archived
Headers show

Comments

rongqing.li@windriver.com - June 24, 2014, 3:11 a.m.
From: Roy Li <rongqing.li@windriver.com>

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@windriver.com>
---
 meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb |    2 ++
 1 file changed, 2 insertions(+)
Joe MacDonald - June 30, 2014, 3:33 a.m.
Merged, thanks.
-J.

[[oe] [PATCH][meta-networking] tftp-hpa: fix a build failure] On 14.06.24 (Tue 11:11) rongqing.li@windriver.com wrote:

> From: Roy Li <rongqing.li@windriver.com>
> 
> 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@windriver.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
> -- 
> 1.7.10.4
>

Patch

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