summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-navigation
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-04-24 17:46:06 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2012-04-29 23:29:33 +0200
commitc11555a5906577ce02d5569023d2025548334839 (patch)
tree20dabfe4af532447b1fbeda55f01a2373722337e /meta-oe/recipes-navigation
parentc09342fd6cc4644eb8114bdd2f004856c8546d50 (diff)
downloadmeta-openembedded-c11555a5906577ce02d5569023d2025548334839.tar.gz
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@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb7
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 d139091fd..fae349240 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() {
46 export HOST_SYS="${HOST_SYS}" 46 export HOST_SYS="${HOST_SYS}"
47} 47}
48 48
49do_install_prepend() { 49do_install() {
50 export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" 50 export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
51 export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" 51 export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config"
52 export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" 52 export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
53 53
54 export BUILD_SYS="${BUILD_SYS}" 54 export BUILD_SYS="${BUILD_SYS}"
55 export HOST_SYS="${HOST_SYS}" 55 export HOST_SYS="${HOST_SYS}"
56
57 export DESTDIR="${D}"
58 # prefix is used for RPATH and DESTDIR/prefix for instalation
59 ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \
60 bbfatal "scons install execution failed."
56} 61}
57 62
58do_install_append() { 63do_install_append() {