[PATCH V2] picocom: Fix build

[PATCH V2] picocom: Fix build

[Marek Vasut]

The picocom complains about missing GNU_HASH from the binary during
QA stage, this is because the picocom Makefile overrides CPPFLAGS,
CFLAGS and LDFLAGS. Fix this by passing those as an argument to make.
Moreover, since picocom 1.7 now accepts VERSION variable and the
UUCP_LOCK_DIR is set to /var/lock by default, drop the CPPFLAGS
override altogether and replace it simply with passing VERSION
argument to make to precisely retain the original intention.

Signed-off-by: Marek Vasut <marex@denx.de>
---
V2: Use EXTRA_OEMAKE instead of custom do_configure
---
 meta-oe/recipes-support/picocom/picocom_1.7.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/picocom/picocom_1.7.bb b/meta-oe/recipes-support/picocom/picocom_1.7.bb
index dbee65609..ca0b8f419 100644
--- a/meta-oe/recipes-support/picocom/picocom_1.7.bb
+++ b/meta-oe/recipes-support/picocom/picocom_1.7.bb
@@ -9,7 +9,8 @@ SRC_URI = "http://picocom.googlecode.com/files/picocom-${PV}.tar.gz"
 SRC_URI[md5sum] = "8eaba1d31407e8408674d6e57af447ef"
 SRC_URI[sha256sum] = "d0f31c8f7a215a76922d30c81a52b9a2348c89e02a84935517002b3bc2c1129e"
 
-CPPFLAGS_append = '-DVERSION_STR=\\"${PV}\\" -DUUCP_LOCK_DIR=\\"/var/lock\\" -DHIGH_BAUD'
+EXTRA_OEMAKE_append = "'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \
+			'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}'"
 
 do_install () {
     install -d ${D}${bindir}
-- 
2.11.0

Re: [PATCH V2] picocom: Fix build

[Christopher Larson]

On Thu, Jan 19, 2017 at 5:15 PM, Marek Vasut <marex@denx.de> wrote:

> The picocom complains about missing GNU_HASH from the binary during
> QA stage, this is because the picocom Makefile overrides CPPFLAGS,
> CFLAGS and LDFLAGS. Fix this by passing those as an argument to make.
> Moreover, since picocom 1.7 now accepts VERSION variable and the
> UUCP_LOCK_DIR is set to /var/lock by default, drop the CPPFLAGS
> override altogether and replace it simply with passing VERSION
> argument to make to precisely retain the original intention.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> ---
> V2: Use EXTRA_OEMAKE instead of custom do_configure
> ---
>  meta-oe/recipes-support/picocom/picocom_1.7.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-support/picocom/picocom_1.7.bb
> b/meta-oe/recipes-support/picocom/picocom_1.7.bb
> index dbee65609..ca0b8f419 100644
> --- a/meta-oe/recipes-support/picocom/picocom_1.7.bb
> +++ b/meta-oe/recipes-support/picocom/picocom_1.7.bb
> @@ -9,7 +9,8 @@ SRC_URI = "http://picocom.googlecode.
> com/files/picocom-${PV}.tar.gz"
>  SRC_URI[md5sum] = "8eaba1d31407e8408674d6e57af447ef"
>  SRC_URI[sha256sum] = "d0f31c8f7a215a76922d30c81a52b9
> a2348c89e02a84935517002b3bc2c1129e"
>
> -CPPFLAGS_append = '-DVERSION_STR=\\"${PV}\\"
> -DUUCP_LOCK_DIR=\\"/var/lock\\" -DHIGH_BAUD'
> +EXTRA_OEMAKE_append = "'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \


I'd suggest ditching the pointless _append while you're at it (just use =
or +=). Besides, the use of _append was missing a space separator, so the
CC wouldn't be obeyed.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics