[oe-commits] org.oe.oz354x fontconfig-native: use proper freetype-config-native to close #1714

[hrw commit]

fontconfig-native: use proper freetype-config-native to close #1714

Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: 85058ff9c843c7fe775aa1357c74da683b0aa5f7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=85058ff9c843c7fe775aa1357c74da683b0aa5f7
Files:
1
packages/fontconfig/fontconfig-native_2.2.95.bb
Diffs:

#
# mt diff -ra8062477ef79bb2a28d38500448f79e56ff308cf -r85058ff9c843c7fe775aa1357c74da683b0aa5f7
#
# 
# 
# patch "packages/fontconfig/fontconfig-native_2.2.95.bb"
#  from [a161c09ce7eedd81388b8bd52dc69bf42a29b5b5]
#    to [72f6b374d76c5ca02747c83d84bda0c75d3f8810]
# 
============================================================
--- packages/fontconfig/fontconfig-native_2.2.95.bb	a161c09ce7eedd81388b8bd52dc69bf42a29b5b5
+++ packages/fontconfig/fontconfig-native_2.2.95.bb	72f6b374d76c5ca02747c83d84bda0c75d3f8810
@@ -1,11 +1,12 @@ LICENSE = "BSD"
 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}"
 
 EXTRA_OEMAKE = ""
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
 
 do_stage () {
 	oe_runmake install