Skip to contentSkip to conversation

lftp: Fix useless-rpaths QA issue

PATCH New Khem Raj 1 participant 2 messages Apr 27, 2018

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 lftp: Fix useless-rpaths QA issue

Signed-off-by Khem Raj <[email protected]>
---
 meta-networking/recipes-connectivity/lftp/lftp_4.8.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/lftp/lftp_4.8.3.bb +1 -1
index 08d89b8c5..c6e37277e 100644
@@ -16,7 +16,7 @@ inherit autotools gettext pkgconfig
 
 acpaths = "-I ./m4"
 
-EXTRA_OECONF += "--with-modules"
+EXTRA_OECONF += "--with-modules --disable-rpath"
 
 PACKAGECONFIG ??= "openssl zlib gnutls readline expat"
 PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl"
Signature · 1 line
2.17.0
author
#1 lore raw

PATCH 2/2 python-evdev: Use target header to generate ecodes.c

ecodes.c is generated file and if we do not specify the linux input headers it happiliy defaults to /usr/include/ to look for these headers while emitting code for ecodes.c which can cause gripes when build systems kernel UAPI is different than the target kernel. Mysterious build errors or even worse runtime errors can start to appear.

e.g.

| evdev/ecodes.c:603:29: error: 'KEY_ROTATE_LOCK_TOGGLE' undeclared (first use in this function); did you mean 'KEY_ATTENDANT_TOGGLE'?

Signed-off-by Khem Raj <[email protected]>
---
 meta-python/recipes-devtools/python/python-evdev.inc | 6 ++++++
 1 file changed, 6 insertions(+)
meta-python/recipes-devtools/python/python-evdev.inc +6 -0
index ccd5077da..5a3884a6f 100644
@@ -6,6 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2"
 SRC_URI[md5sum] = "c7e855ae9f97f869a59e75b29f05ce74"
 SRC_URI[sha256sum] = "57edafc469a414f58b51af1bfb9ee2babb9f626dd2df530d71c1176871850aa1"
 
+do_compile_prepend() {
+    rm -rf ${S}/evdev/ecodes.c
+}
+
+DISTUTILS_BUILD_ARGS = "build_ecodes --evdev-headers ${STAGING_DIR_TARGET}/usr/include/linux/input.h:${STAGING_DIR_TARGET}/usr/include/linux/input-event-codes.h"
+
 RDEPENDS_${PN} += "\
     ${PYTHON_PN}-ctypes \
     ${PYTHON_PN}-fcntl \
Signature · 1 line
2.17.0