From c11555a5906577ce02d5569023d2025548334839 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 24 Apr 2012 17:46:06 +0200 Subject: [PATCH] gpsd: replace whole do_install from scons.bbclass * prefix was wrong, because SConstruct expects prefix usable as RPATH and DESTDIR not DESTDIR/prefix combined together in prefix variable Signed-off-by: Martin Jansa --- meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb index d139091fdc..fae3492401 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb @@ -46,13 +46,18 @@ do_compile_prepend() { export HOST_SYS="${HOST_SYS}" } -do_install_prepend() { +do_install() { 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 BUILD_SYS="${BUILD_SYS}" export HOST_SYS="${HOST_SYS}" + + export DESTDIR="${D}" + # prefix is used for RPATH and DESTDIR/prefix for instalation + ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \ + bbfatal "scons install execution failed." } do_install_append() {