From e1b08f24f2ae9089307f3252ce7dd6456f7ba2b3 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 16 Nov 2013 21:49:44 +0100 Subject: [PATCH] Fontconfig: fix secondary architecture build * Missing suffix for binaries * Export pkg-config path so pkg-config picks the libs (freetype, in this case) for the right architecture. --- .../fontconfig/fontconfig-2.11.0.recipe | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/media-libs/fontconfig/fontconfig-2.11.0.recipe b/media-libs/fontconfig/fontconfig-2.11.0.recipe index 19ae0fb09..d310f1569 100644 --- a/media-libs/fontconfig/fontconfig-2.11.0.recipe +++ b/media-libs/fontconfig/fontconfig-2.11.0.recipe @@ -18,14 +18,14 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" fontconfig$secondaryArchSuffix = $portVersion compat >= 2 - cmd:fc_cache - cmd:fc_cat - cmd:fc_list - cmd:fc_match - cmd:fc_pattern - cmd:fc_query - cmd:fc_scan - cmd:fc_validate + cmd:fc_cache$secondaryArchSuffix + cmd:fc_cat$secondaryArchSuffix + cmd:fc_list$secondaryArchSuffix + cmd:fc_match$secondaryArchSuffix + cmd:fc_pattern$secondaryArchSuffix + cmd:fc_query$secondaryArchSuffix + cmd:fc_scan$secondaryArchSuffix + cmd:fc_validate$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix = 1.8.0 compat >= 1 " @@ -57,12 +57,14 @@ BUILD_PREREQUIRES=" PATCHES="fontconfig-2.11.0.patch" GLOBAL_WRITABLE_FILES=" - settings/fonts/conf.d directory + settings/fonts/conf.d directory keep-old settings/fonts/fonts.conf auto-merge " BUILD() { + export PKG_CONFIG_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib$secondaryArchSubDir/pkgconfig + mkdir -p `finddir B_USER_CACHE_DIRECTORY` libtoolize --force --copy --install aclocal