diff --git a/net-misc/curl/curl-8.10.1.recipe b/net-misc/curl/curl-8.10.1.recipe index 517a2a8ce..242d482ad 100644 --- a/net-misc/curl/curl-8.10.1.recipe +++ b/net-misc/curl/curl-8.10.1.recipe @@ -9,7 +9,7 @@ busload of other useful tricks." HOMEPAGE="https://curl.haxx.se/" COPYRIGHT="1996-2024 Daniel Stenberg" LICENSE="Curl" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/curl/curl/releases/download/curl-${portVersion//\./_}/curl-$portVersion.tar.bz2" CHECKSUM_SHA256="3763cd97aae41dcf41950d23e87ae23b2edb2ce3a5b0cf678af058c391b6ae31" ADDITIONAL_FILES="curl.rdef" @@ -30,11 +30,15 @@ REQUIRES=" haiku$secondaryArchSuffix ca_root_certificates lib:libnghttp2$secondaryArchSuffix - lib:libpsl$secondaryArchSuffix lib:libssh2$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix " +if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then + REQUIRES+=" + lib:libpsl$secondaryArchSuffix + " +fi PROVIDES_devel=" curl${secondaryArchSuffix}_devel = $portVersion @@ -51,11 +55,15 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libnghttp2$secondaryArchSuffix - devel:libpsl$secondaryArchSuffix devel:libssh2$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix " +if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then + BUILD_REQUIRES+=" + devel:libpsl$secondaryArchSuffix + " +fi BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf @@ -86,9 +94,14 @@ BUILD() certsInstallDir="$portPackageLinksDir/ca_root_certificates" certsDir="$certsInstallDir/$relativeDataRootDir/ssl" + if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then + configureArgs=--without-libpsl + else + configureArgs= + fi autoreconf -vfi autoconf - CPPFLAGS=-D_BSD_SOURCE runConfigure ./configure \ + CPPFLAGS=-D_BSD_SOURCE runConfigure ./configure $configureArgs \ --enable-ipv6 --enable-manual \ --enable-websockets \ --with-openssl --with-libssh2 \