[oe-commits] [meta-openembedded] 28/29: picocom: Fix build

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch morty-next
in repository meta-openembedded.

commit f6e647205f4e154f287ef769f3f5d054d44a0ba2
Author: Marek Vasut <marex at denx.de>
AuthorDate: Fri Jan 20 11:59:08 2017 +0100

    picocom: Fix build
    
    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 at denx.de>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    (cherry picked from commit d77049facb76c9372101ccaa38e6f0523cf6c05d)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 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 dbee656..d2a76c0 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 = "'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \
+		'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "
 
 do_install () {
     install -d ${D}${bindir}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.