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

Fix haikuwebkit recipe not finding sqlite and ICU

Browse Source 
... on gcc2hybrid only.
This commit is contained in:
Adrien Destugues
2013-12-18 10:02:42 +01:00
parent 9776c3e80c
commit fe77860961
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
View File

@@ -24,7 +24,7 @@ PROVIDES="
" "
REQUIRES=" REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion haiku$secondaryArchSuffix >= $haikuVersion
icu$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix
lib:libpng$secondaryArchSuffix lib:libpng$secondaryArchSuffix
lib:libsqlite3$secondaryArchSuffix lib:libsqlite3$secondaryArchSuffix
@@ -36,7 +36,7 @@ REQUIRES="
BUILD_REQUIRES=" BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion haiku${secondaryArchSuffix}_devel >= $haikuVersion
haiku_devel >= $haikuVersion haiku_devel >= $haikuVersion
icu${secondaryArchSuffix}_devel devel:libicuuc$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix
devel:libpng$secondaryArchSuffix devel:libpng$secondaryArchSuffix
devel:libsqlite3$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix
@@ -63,8 +63,9 @@ SOURCE_DIR="haikuwebkit_x86-$portVersion-Source"
BUILD() BUILD()
{ {
export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
Tools/Scripts/build-webkit --haiku --no-webkit2 \ Tools/Scripts/build-webkit --haiku --no-webkit2 \
--cmakearg="-DCMAKE_LIBRARY_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib -DCMAKE_INSTALL_PREFIX=$prefix" --cmakearg="-DCMAKE_LIBRARY_PATH=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir -DCMAKE_INCLUDE_PATH=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir -DCMAKE_INSTALL_PREFIX=$prefix"
} }
INSTALL() INSTALL()