summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <kergoth@openedhand.com>2006-08-18 08:07:24 +0000
committerChris Larson <kergoth@openedhand.com>2006-08-18 08:07:24 +0000
commit10984ecd54feed390029271f4a82708e431bcfcb (patch)
treec06a5d2dc2ab55436549517a622adb98fdd880ec
parent7b8d7fed531944058d79a678042eadf45ec0ffe5 (diff)
downloadopenembedded-core-10984ecd54feed390029271f4a82708e431bcfcb.tar.gz
openembedded-core-10984ecd54feed390029271f4a82708e431bcfcb.tar.bz2
openembedded-core-10984ecd54feed390029271f4a82708e431bcfcb.tar.xz
openembedded-core-10984ecd54feed390029271f4a82708e431bcfcb.zip
fontconfig-native: call out freetype-config-native, not freetype-config. the inadvertant inclusion of the target staging dirs in the lib search paths can break the x86 builds.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@615 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/fontconfig/fontconfig-native_2.2.95.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/packages/fontconfig/fontconfig-native_2.2.95.bb b/meta/packages/fontconfig/fontconfig-native_2.2.95.bb
index 6872db92f..721f067bf 100644
--- a/meta/packages/fontconfig/fontconfig-native_2.2.95.bb
+++ b/meta/packages/fontconfig/fontconfig-native_2.2.95.bb
@@ -1,12 +1,13 @@
SECTION = "base"
LICENSE = "BSD"
-include fontconfig_${PV}.bb
+require fontconfig_${PV}.bb
inherit native
DEPENDS = "freetype-native expat-native zlib-native"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
SRC_URI += " file://stop-fc-cache.patch;patch=1"
EXTRA_OEMAKE = ""
+EXTRA_OECONF += "--with-freetype-config=${STAGING_BINDIR}/freetype-config-native"
do_stage () {
oe_runmake install