haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

glib2: fix pkgconfig files, add devel dependencies.

Browse Source
This commit is contained in:
Jerome Duval
2014-10-04 11:34:17 +00:00
parent b63f9a572d
commit d78f3729ff
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dev-libs/glib/glib2-2.38.1.recipe
View File

@@ -24,7 +24,7 @@ COPYRIGHT="1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
2008-2010 Collabora Ltd. 2008-2010 Collabora Ltd.
1995-2010 Several others" 1995-2010 Several others"
REVISION="3" REVISION="4"
ARCHITECTURES="x86_gcc2 x86 x86_64" ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -107,6 +107,19 @@ INSTALL()
libgmodule-2.0 \ libgmodule-2.0 \
libgobject-2.0 \ libgobject-2.0 \
libgthread-2.0 libgthread-2.0
fixPkgconfig
# 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 ffiLinksDir="$packageLinksDir/${develPackageName}/devel~libffi$secondaryArchSuffix/$relativeDevelopLibDir"
sed -i -e "s,^\(Libs.private.*\)-L.* \(-l.*\)$,\1-L$ffiLinksDir \2," \
$developLibDir/pkgconfig/gobject-2.0.pc
local zlibLinksDir="$packageLinksDir/${develPackageName}/devel~libz$secondaryArchSuffix/$relativeDevelopLibDir"
sed -i -e "s,^\(Libs.private.*\)-L.* \(-l.*\)$,\1-L$zlibLinksDir \2," \
$developLibDir/pkgconfig/gio-2.0.pc
# move the glibconfig header into devel as well # move the glibconfig header into devel as well
mv $libDir/glib-2.0 $developLibDir mv $libDir/glib-2.0 $developLibDir
@@ -131,4 +144,8 @@ PROVIDES_devel="
REQUIRES_devel=" REQUIRES_devel="
glib2$secondaryArchSuffix == $portVersion base glib2$secondaryArchSuffix == $portVersion base
devel:libffi$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
devel:libz$secondaryArchSuffix
" "