Re: [PR PATCH] [Updated] common/build-helper/rust.sh: dynamic linking to libpcre2 on musl

[Logarithmus <Logarithmus@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 545 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 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: 4414 bytes --]

From 65154c329e70f05e6b559871d91d9f8e8c74f2aa Mon Sep 17 00:00:00 2001
From: Artur Sinila <personal@logarithmus.dev>
Date: Mon, 28 Sep 2020 08:51:45 +0300
Subject: [PATCH 1/3] New package: cross-avr-gdb

---
 srcpkgs/cross-avr-gdb/template | 80 ++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 srcpkgs/cross-avr-gdb/template

diff --git a/srcpkgs/cross-avr-gdb/template b/srcpkgs/cross-avr-gdb/template
new file mode 100644
index 00000000000..e01a4bf6bfa
--- /dev/null
+++ b/srcpkgs/cross-avr-gdb/template
@@ -0,0 +1,80 @@
+# Template file for 'cross-${_triplet}-${_pkgname}'
+_triplet=avr
+_pkgname=gdb
+pkgname=cross-${_triplet}-${_pkgname}
+version=9.2
+revision=1
+wrksrc=${_pkgname}-${version}
+build_style=gnu-configure
+pycompile_dirs="/usr/share/gdb/python"
+configure_args="\
+	--target=${_triplet} \
+	--program-prefix=${_triplet}- \
+	--disable-werror \
+	--disable-nls \
+	--with-system-readline \
+	--with-system-gdbinit=/etc/gdb/gdbinit \
+	--with-system-zlib $(vopt_enable gdbserver) \
+	$(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static') \
+	$(vopt_if python --with-python=/usr/bin/python3)"
+hostmakedepends="texinfo perl $(vopt_if python python3-devel)"
+makedepends="ncurses-devel zlib-devel readline-devel expat-devel
+	$(vopt_if python 'python3-devel gettext-libs')"
+depends=gdb
+short_desc="GNU Debugger for AVR"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/gdb/"
+distfiles="${GNU_SITE}/${_pkgname}/${_pkgname}-${version}.tar.xz"
+checksum=360cd7ae79b776988e89d8f9a01c985d0b1fa21c767a4295e5f88cb49175c555
+python_version=3
+
+if [ "${CROSS_BUILD}" ]; then
+	# Make python3.x detection work in cross builds
+	CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+	CXXFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+fi
+CFLAGS+=" -fcommon"
+CXXFLAGS+=" -fcommon"
+# Package build options
+build_options="gdbserver static python"
+desc_option_gdbserver="Enable support for building GDB server"
+# By default, don't enable any of build options
+#build_options_default="gdbserver"
+# Both options cannot be enabled at the same time
+vopt_conflict gdbserver static
+
+post_extract() {
+	vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c
+	mkdir -p build
+}
+
+do_configure() {
+	cd build
+	../configure ${configure_args/with-sysroot/with-build-sysroot} \
+		CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD} -fcommon"
+	export gl_cv_func_gettimeofday_clobber=no
+	export gl_cv_func_working_strerror=yes
+	export gl_cv_func_strerror_0_works=yes
+}
+
+do_build() {
+	cd build
+	make ${makejobs} all
+}
+
+do_install() {
+	cd build
+	make DESTDIR=${DESTDIR} ${makejobs} install
+	# resolve conflicts with binutils
+	rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib
+	rm -rf ${DESTDIR}/usr/lib64
+	for f in bfd configure standards; do
+		rm -f ${DESTDIR}/usr/share/info/${f}.info*
+	done
+}
+
+post_install() {
+	# resolve conflicts with binutils and native gdb
+	rm -fr usr/{share/{locale,gdb,info},include}
+}

From 84f91a015b7abe24ee55153c3c7436c65d6e26bb Mon Sep 17 00:00:00 2001
From: Artur Sinila <personal@logarithmus.dev>
Date: Tue, 29 Sep 2020 02:55:05 +0300
Subject: [PATCH 2/3] 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 48f9ee450cdae1f5486137da02c51f2b5a9e2310 Mon Sep 17 00:00:00 2001
From: Artur Sinila <personal@logarithmus.dev>
Date: Tue, 29 Sep 2020 03:32:25 +0300
Subject: [PATCH 3/3] 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"