summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/binconfig.bbclass13
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/packages/fontconfig/fontconfig-native_2.2.95.bb2
3 files changed, 6 insertions, 11 deletions
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 317e080fc5..dadf2dddfc 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -20,11 +20,6 @@ def get_binconfig_mangle(d):
20 s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" 20 s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'"
21 return s 21 return s
22 22
23# Native package configurations go in ${BINDIR}/<name>-config-native to prevent a collision with cross packages
24def is_native(d):
25 import bb.data
26 return ["","-native"][bb.data.inherits_class('native', d)]
27
28BINCONFIG_GLOB ?= "*-config" 23BINCONFIG_GLOB ?= "*-config"
29 24
30do_install_append() { 25do_install_append() {
@@ -52,9 +47,9 @@ do_install_append() {
52 47
53do_stage_append() { 48do_stage_append() {
54 for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do 49 for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
55 configname=`basename $config`${@is_native(d)} 50 configname=`basename $config`
56 install -d ${STAGING_BINDIR} 51 install -d ${STAGING_BINDIR_CROSS}
57 cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname 52 cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR_CROSS}/$configname
58 chmod u+x ${STAGING_BINDIR}/$configname 53 chmod u+x ${STAGING_BINDIR_CROSS}/$configname
59 done 54 done
60} 55}
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 76bc40c845..9c4d30be25 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -163,7 +163,7 @@ S = "${WORKDIR}/${P}"
163B = "${S}" 163B = "${S}"
164 164
165STAGING_DIR = "${TMPDIR}/staging" 165STAGING_DIR = "${TMPDIR}/staging"
166STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}" 166STAGING_BINDIR = "${STAGING_DIR}/${HOST_SYS}/bin"
167STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}" 167STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}"
168STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin" 168STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
169STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib" 169STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
diff --git a/meta/packages/fontconfig/fontconfig-native_2.2.95.bb b/meta/packages/fontconfig/fontconfig-native_2.2.95.bb
index 721f067bf6..69caf6cf73 100644
--- a/meta/packages/fontconfig/fontconfig-native_2.2.95.bb
+++ b/meta/packages/fontconfig/fontconfig-native_2.2.95.bb
@@ -7,7 +7,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
7SRC_URI += " file://stop-fc-cache.patch;patch=1" 7SRC_URI += " file://stop-fc-cache.patch;patch=1"
8 8
9EXTRA_OEMAKE = "" 9EXTRA_OEMAKE = ""
10EXTRA_OECONF += "--with-freetype-config=${STAGING_BINDIR}/freetype-config-native" 10EXTRA_OECONF += "--with-freetype-config=${STAGING_BINDIR}/freetype-config"
11 11
12do_stage () { 12do_stage () {
13 oe_runmake install 13 oe_runmake install