From: Logarithmus <Logarithmus@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] common/build-helper/rust.sh: dynamic linking to libpcre2 even on musl
Date: Tue, 29 Sep 2020 02:32:45 +0200 [thread overview]
Message-ID: <20200929003245.lM-XZaco44RQgVn2jkAczKF0HCTxrfYvkpfMPZWQCZs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25182@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 550 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages rust-pcre-sys
https://github.com/void-linux/void-packages/pull/25182
common/build-helper/rust.sh: dynamic linking to libpcre2 even on musl
By default, `pcre2-sys` crate use static linking on `musl` targets. This patch fixes such behavior and all Rust crates will automatically use system-provided `libpcre2` on musl.
A patch file from https://github.com/void-linux/void-packages/pull/25182.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-pcre-sys-25182.patch --]
[-- Type: text/x-diff, Size: 1374 bytes --]
From a7dcddd07d15c84b4068603c333fd6dda649aeea Mon Sep 17 00:00:00 2001
From: Artur Sinila <personal@logarithmus.dev>
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 <personal@logarithmus.dev>
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"
next prev parent reply other threads:[~2020-09-29 0:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 0:13 [PR PATCH] " Logarithmus
2020-09-29 0:25 ` [PR REVIEW] " ericonr
2020-09-29 0:29 ` [PR PATCH] [Updated] " Logarithmus
2020-09-29 0:32 ` Logarithmus [this message]
2020-09-29 2:34 ` ericonr
2020-10-05 14:33 ` [PR PATCH] [Updated] common/build-helper/rust.sh: dynamic linking to libpcre2 " Logarithmus
2020-10-05 15:25 ` Logarithmus
2020-10-05 15:27 ` Logarithmus
2020-10-05 15:41 ` Logarithmus
2020-10-05 18:49 ` Logarithmus
2020-10-05 18:57 ` ericonr
2020-10-06 14:30 ` sgn
2020-10-06 17:15 ` Logarithmus
2020-10-06 17:15 ` Logarithmus
2020-10-06 17:20 ` Logarithmus
2020-10-09 20:11 ` ericonr
2020-10-15 6:09 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200929003245.lM-XZaco44RQgVn2jkAczKF0HCTxrfYvkpfMPZWQCZs@z \
--to=logarithmus@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).