commit 838f8f7eb6a5f97b7601f7eabab7e901cd1dac81 Author: Tim Biermann <tbier@posteo.de> Date: Sun Mar 26 17:16:51 2023 +0200 r: build against curl 8 diff --git a/r/.signature b/r/.signature index 61ff0e523..7d9eaaf12 100644 --- a/r/.signature +++ b/r/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33Qco6Q4AoukKHjRZyIAbx8th4DVrJkNSwGNnfinwZCUVzlDhFcKKsl4TqvgoI6/BQvn6umwmiw3u4DesQQikAw= -SHA256 (Pkgfile) = a3d16809f70229803df5000adafbad8f64d7cacbcafb0a4bd17a1f939f5d229a +RWSagIOpLGJF34I9nsPZ8kWx4j9jByG9l7rDSzkZmmrXlSbXcbe8frUkWgRhnVT+wvGf4Hz7agtPFx66AfyV/LRrJA2IjUDXVQw= +SHA256 (Pkgfile) = dc692beb9d5e0c210d815523230694bc7941395e315780dd95b2c88c251c2f1e SHA256 (.footprint) = 665cccb2f203c0b448be4f31597184cdfa3a1062ce3ff85f2f1dbbf0f3a57ff4 SHA256 (R-4.2.3.tar.gz) = 55e4a9a6d43be314e2c03d0266a6fa5444afdce50b303bfc3b82b3979516e074 SHA256 (r.desktop) = 25b01ea93fa704884b65ba002d44d4e99725bd826997e8c73b6467df9f23c798 diff --git a/r/Pkgfile b/r/Pkgfile index c3e23b2a3..0115257ca 100644 --- a/r/Pkgfile +++ b/r/Pkgfile @@ -17,6 +17,10 @@ source=(https://cran.r-project.org/src/base/R-${version::1}/R-$version.tar.gz build() { cd R-$version + # override the upstream opinion that curl 8 has an incompatible API + curlTest=$(grep -n "LIBCURL_VERSION_MAJOR > 7" configure | cut -d: -f1) + sed -i "$((curlTest + 1))s/exit.1./exit(0)/" configure + # https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-lang/R/files patch -Np1 -i $SRC/R-3.4.1-parallel.patch patch -Np1 -i $SRC/R-3.4.1-rmath-shared.patch