[oe-commits] Martin Jansa : gpsd: replace whole do_install from scons.bbclass
git at git.openembedded.org
git at git.openembedded.org
Fri May 4 08:25:40 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: c11555a5906577ce02d5569023d2025548334839
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c11555a5906577ce02d5569023d2025548334839
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Tue Apr 24 17:46:06 2012 +0200
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 <Martin.Jansa at gmail.com>
---
meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
index d139091..fae3492 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() {
More information about the Openembedded-commits
mailing list