mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-02 21:18:51 +02:00
Fix haikuwebkit recipe not finding sqlite and ICU
... on gcc2hybrid only.
This commit is contained in:
@@ -24,7 +24,7 @@ PROVIDES="
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix >= $haikuVersion
|
||||
icu$secondaryArchSuffix
|
||||
lib:libicuuc$secondaryArchSuffix
|
||||
lib:libjpeg$secondaryArchSuffix
|
||||
lib:libpng$secondaryArchSuffix
|
||||
lib:libsqlite3$secondaryArchSuffix
|
||||
@@ -36,7 +36,7 @@ REQUIRES="
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel >= $haikuVersion
|
||||
haiku_devel >= $haikuVersion
|
||||
icu${secondaryArchSuffix}_devel
|
||||
devel:libicuuc$secondaryArchSuffix
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
devel:libpng$secondaryArchSuffix
|
||||
devel:libsqlite3$secondaryArchSuffix
|
||||
@@ -63,8 +63,9 @@ SOURCE_DIR="haikuwebkit_x86-$portVersion-Source"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
|
||||
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()
|
||||
|
||||
Reference in New Issue
Block a user