From a7dcddd07d15c84b4068603c333fd6dda649aeea Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Tue, 29 Sep 2020 02:55:05 +0300 Subject: [PATCH 1/2] common/build-helper/rust.sh: dynamic linking to libpcre2 on musl --- common/build-helper/rust.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh index a62503583f3..6fcd3bd7d9e 100644 --- a/common/build-helper/rust.sh +++ b/common/build-helper/rust.sh @@ -38,3 +38,6 @@ export SODIUM_INC_DIR="${XBPS_CROSS_BASE}/usr/lib" # openssl-sys export OPENSSL_NO_VENDOR=1 + +# pcre2-sys, only necessary for musl targets +export PCRE2_SYS_STATIC=0 From d986821ad42d997008186ee97d4b15ce06dbeeed Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Tue, 29 Sep 2020 03:32:25 +0300 Subject: [PATCH 2/2] ripgrep: revbump to use system-provided libpcre2 on musl --- srcpkgs/ripgrep/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ripgrep/template b/srcpkgs/ripgrep/template index 339d2de3a39..b2ec6ad3d34 100644 --- a/srcpkgs/ripgrep/template +++ b/srcpkgs/ripgrep/template @@ -1,7 +1,7 @@ # Template file for 'ripgrep' pkgname=ripgrep version=12.1.1 -revision=1 +revision=2 build_style=cargo configure_args="--features=pcre2" hostmakedepends="ruby-asciidoctor pkg-config"