haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 20:20:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

freetype: fix libtool also for secondary arch.

Browse Source
This commit is contained in:
Adrien Destugues
2014-09-25 15:25:38 +02:00
parent 3a25b2bcf5
commit f71a79f714
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media-libs/freetype/freetype-2.5.3.recipe
View File

@@ -9,7 +9,7 @@ LICENSE="FreeType"
COPYRIGHT="1996-2013 David Turner, Robert Wilhelm, Werner Lemberg, et al."
SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-$portVersion.tar.bz2"
CHECKSUM_SHA256="c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e"
REVISION="2"
REVISION="3"
ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -61,14 +61,17 @@ INSTALL()
# that from the pkg-config file, making it difficult for other ports to use
# freetype with pkg-config.
sed -i -e "s,^includedir=.*,includedir=$prefix/$relativeIncludeDir/freetype2," \
$developLibDir/pkgconfig/freetype2.pc
local develPackageName="${portName}_devel-$portFullVersion"
local packageLinksDir=$(dirname $portPackageLinksDir)
local linksDir="$packageLinksDir/${develPackageName}/devel~libpng15/$relativeDevelopLibDir"
$developLibDir/pkgconfig/freetype2.pc
# The libtool files 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~libpng15$secondaryArchSuffix/$relativeDevelopLibDir"
sed -i -e "s,^\(Libs.private.*\)-L.* \(-l.*\)$,\1-L$linksDir \2," \
$developLibDir/pkgconfig/freetype2.pc
sed -i -e "s,^\(dependency_libs.*\)-L.* \(-l.*\)$,\1-L$linksDir $linksDir/libpng15.la \2," \
$developLibDir/libfreetype.la
$developLibDir/libfreetype.la
# devel package
packageEntries devel \