From af1e36b559cf2f9ffe9f34828853538c3d162ec4 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Tue, 23 Jun 2020 13:20:56 +0200 Subject: [PATCH] gpsd: Fix do_install taking ages scons was called manually in do_install step with different parameters than in do_compile step, leading to a recompilation in do_install (but without -j4), leading it to take very long. BugzID: 62046 --- recipes-connectivity/gpsd/gpsd_3.20.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes-connectivity/gpsd/gpsd_3.20.bb b/recipes-connectivity/gpsd/gpsd_3.20.bb index 07aad5c..530517f 100644 --- a/recipes-connectivity/gpsd/gpsd_3.20.bb +++ b/recipes-connectivity/gpsd/gpsd_3.20.bb @@ -35,6 +35,7 @@ EXTRA_OESCONS = " \ libdir='${libdir}' \ manbuild='false' \ ${PACKAGECONFIG_CONFARGS} \ + python_libdir=${libdir} \ " # this cannot be used, because then chrpath is not found and only static lib is built # target=${HOST_SYS} @@ -46,16 +47,13 @@ do_compile_prepend() { export LINKFLAGS="${LDFLAGS}" } -do_install() { +do_install_prepend() { export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" export LINKFLAGS="${LDFLAGS}" export DESTDIR="${D}" - # prefix is used for RPATH and DESTDIR/prefix for instalation - ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} python_libdir=${libdir} install ${EXTRA_OESCONS} || \ - bbfatal "scons install execution failed." } do_install_append() {