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

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 6872db92f1..721f067bf6 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