Fix build of some recipes

- Force version of boost, otherwise we get boost 1.57 and nothing works
  with it because it's too old
- Remove now unneeded DISABLE_ASLR in haikuwebkit package (it is done
  correctly in the gcc11 recipe now)
This commit is contained in:
Adrien Destugues
2021-11-06 18:56:48 +01:00
parent b02e813ae4
commit 278efefce1
3 changed files with 3 additions and 5 deletions

View File

@@ -8,7 +8,7 @@ HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/index.php"
COPYRIGHT="2003-2020 Intra2net AG and the libftdi developers"
LICENSE="GNU LGPL v2.1
GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://www.intra2net.com/en/developer/libftdi/download/libftdi1-$portVersion.tar.bz2"
CHECKSUM_SHA256="7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049"
SOURCE_DIR="libftdi1-$portVersion"
@@ -28,7 +28,6 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libboost_unit_test_framework$secondaryArchSuffix
lib:libconfuse$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libusb_1.0$secondaryArchSuffix
@@ -47,7 +46,7 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libboost_unit_test_framework$secondaryArchSuffix
devel:libboost_unit_test_framework$secondaryArchSuffix >= 1.70.0
devel:libconfuse$secondaryArchSuffix
devel:libusb_1.0$secondaryArchSuffix
"

View File

@@ -69,7 +69,7 @@ REQUIRES="
"
BUILD_REQUIRES="
devel:libboost_graph$secondaryArchSuffix
devel:libboost_graph$secondaryArchSuffix >= 1.70.0
devel:libiconv$secondaryArchSuffix
devel:libreadline$secondaryArchSuffix
devel:libz$secondaryArchSuffix

View File

@@ -88,7 +88,6 @@ BUILD_PREREQUIRES="
BUILD()
{
export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
export DISABLE_ASLR=1
Tools/Scripts/build-webkit --haiku --no-webkit2 \
--cmakeargs="-DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=Release -DSHOULD_INSTALL_JS_SHELL=ON"
}