Skip to contentSkip to conversation

picocom: Fix build

PATCH Superseded Marek Vasut 2 participants 3 messages Jan 19, 2017

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta-oe/recipes-support/picocom/picocom_1.7.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-oe/recipes-support/picocom/picocom_1.7.bb +4 -1
index dbee65609..0f85b3ec8 100644
@@ -9,7 +9,10 @@ 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'
+do_compile () {
+    oe_runmake 'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \
+               'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}'
+}
 
 do_install () {
     install -d ${D}${bindir}
Signature · 1 line
2.11.0
#1 lore raw

Why not use EXTRA_OEMAKE to set these variables?

Quoted 42 lines · 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.

---
 meta-oe/recipes-support/picocom/picocom_1.7.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-oe/recipes-support/picocom/picocom_1.7.bb +0 -0
index dbee65609..0f85b3ec8 100644
@@ -9,7 +9,10 @@ SRC_URI = "http://picocom.googlecode.

com/files/picocom-${PV}.tar.gz"
SRC_URI[md5sum] = "8eaba1d31407e8408674d6e57af447ef" SRC_URI[sha256sum] = "d0f31c8f7a215a76922d30c81a52b9
a2348c89e02a84935517002b3bc2c1129e"

meta-oe/recipes-support/picocom/picocom_1.7.bb +4 -3
-CPPFLAGS_append = '-DVERSION_STR=\\"${PV}\\"
-DUUCP_LOCK_DIR=\\"/var/lock\\" -DHIGH_BAUD'
+do_compile () {
+    oe_runmake 'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \
+               'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}'
+}
 
 do_install () {
     install -d ${D}${bindir}
--

2.11.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#2 lore raw
Quoted 1 line · Martin Jansa

Why not use EXTRA_OEMAKE to set these variables?

Clearly because I wasn't thinking, I'll send a V2, thanks for spotting this.

Quoted 45 lines · Marek Vasut
Quoted 43 lines

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.

---
 meta-oe/recipes-support/picocom/picocom_1.7.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-oe/recipes-support/picocom/picocom_1.7.bb +0 -0
index dbee65609..0f85b3ec8 100644
@@ -9,7 +9,10 @@ SRC_URI = "http://picocom.googlecode.

com/files/picocom-${PV}.tar.gz"
SRC_URI[md5sum] = "8eaba1d31407e8408674d6e57af447ef" SRC_URI[sha256sum] = "d0f31c8f7a215a76922d30c81a52b9
a2348c89e02a84935517002b3bc2c1129e"

meta-oe/recipes-support/picocom/picocom_1.7.bb +4 -3
-CPPFLAGS_append = '-DVERSION_STR=\\"${PV}\\"
-DUUCP_LOCK_DIR=\\"/var/lock\\" -DHIGH_BAUD'
+do_compile () {
+    oe_runmake 'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \
+               'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}'
+}
 
 do_install () {
     install -d ${D}${bindir}
--

2.11.0

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 2 lines
Best regards,
Marek Vasut