summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-02-16 12:59:15 +0100
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-02-16 13:01:45 +0100
commitdb0f992c9f1b0abb2f0ca240ce4a7636c9953924 (patch)
tree1835d18d48da958583b2dd411e0bc96c43199a63 /conf
parent52ff3239ccd7e8ea9153366a1b672ca0e9befd09 (diff)
bitbake.conf: override XDG_DATA_DIRS to point into our staging area;
this fixes programs using g_get_system_data_dirs() picking up paths outside our safe and cozy environment. NOTE: _If_ this breaks some packages that were previously working, then we are missing something in do_stage of our native packages and we'd rather see it bailing out than silently pick up the wrong files. Think 'fail-fast' for glib.
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 9c187c0757..9aefb63172 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -577,6 +577,8 @@ export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
+export XDG_DATA_DIRS = "${STAGING_DATADIR}"
+
export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake"
export STAGING_SIPDIR = "${STAGING_DATADIR_NATIVE}/sip"
export STAGING_IDLDIR = "${STAGING_DATADIR}/idl"