fontconfig: remove libtool file, fix paths in pkgconfig file

This commit is contained in:
Jerome Duval
2014-11-22 20:07:08 +00:00
parent a776deee95
commit db156a5063

View File

@@ -13,7 +13,7 @@ COPYRIGHT="2000-2005, 2006-2007 Keith Packard
2008 Danilo Segan
2012 Google, Inc.
"
REVISION="2"
REVISION="3"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -92,10 +92,29 @@ INSTALL()
{
make install RUN_FC_CACHE_TEST=false
rm $libDir/*.la
prepareInstalledDevelLibs \
libfontconfig
fixPkgconfig
# The pkgconfig file reference other libraries using the wrong paths, which
# creates a lot of confusion. Fix them so correct paths are used.
local develPackageName="${portName}_devel-$portFullVersion"
local packageLinksDir=$(dirname $portPackageLinksDir)
local linksDir="$packageLinksDir/${develPackageName}/devel~libfreetype$secondaryArchSuffix/$relativeDevelopLibDir"
sed -i -e "s,^\(Libs.private.*\)-L.* \(-lfreetype.*\)$,\1-L$linksDir \2," \
$developLibDir/pkgconfig/fontconfig.pc
linksDir="$packageLinksDir/${develPackageName}/devel~libxml2$secondaryArchSuffix/$relativeDevelopLibDir"
sed -i -e "s,^\(Libs.private.*-lfreetype.*\) -L.* \(-lxml2.*\)$,\1-L$linksDir \2," \
$developLibDir/pkgconfig/fontconfig.pc
linksDir="$packageLinksDir/${develPackageName}/devel~libfreetype$secondaryArchSuffix/$relativeIncludeDir"
sed -i -e "s,^\(Cflags.*\)-I/packages.*\(/freetype2.*\)$,\1-I$linksDir\2," \
$developLibDir/pkgconfig/fontconfig.pc
linksDir="$packageLinksDir/${develPackageName}/devel~libxml2$secondaryArchSuffix/$relativeIncludeDir"
sed -i -e "s,^\(Cflags.*freetype2.*\)-I/packages.*\(/libxml2.*\)$,\1-I$linksDir\2," \
$developLibDir/pkgconfig/fontconfig.pc
packageEntries devel \
$developDir \
$manDir \
@@ -109,4 +128,6 @@ PROVIDES_devel="
REQUIRES_devel="
fontconfig$secondaryArchSuffix == $portVersion base
devel:libfreetype$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
"