[PR PATCH] build-style/perl-module: prepend not reset PERL5LIB

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

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages build-style-perl-module-prepend-not-reset-PERL5LIB
https://github.com/void-linux/void-packages/pull/28513

build-style/perl-module: prepend not reset PERL5LIB


A patch file from https://github.com/void-linux/void-packages/pull/28513.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-build-style-perl-module-prepend-not-reset-PERL5LIB-28513.patch --]
[-- Type: text/x-diff, Size: 1841 bytes --]

From 0b038a848f32bf0ea16d88b9c8c0d2281ca89a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 16:44:07 +0700
Subject: [PATCH 1/2] build-style/perl-module: prepend instead of reset
 PERL5LIB

In the next change, we need to have $wrksrc in PERL5LIB because
'.' is no longer in @INC
---
 common/build-style/perl-module.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/perl-module.sh b/common/build-style/perl-module.sh
index c2d5b8ddeca..002b9cd53c8 100644
--- a/common/build-style/perl-module.sh
+++ b/common/build-style/perl-module.sh
@@ -27,7 +27,7 @@ do_configure() {
 		cp "/usr/lib/perl5/core_perl/Config"*.p? $perlprefix
 		cp "/usr/lib/perl5/core_perl/Errno.pm" $perlprefix
 	fi
-	export PERL5LIB=$perlprefix
+	export PERL5LIB="$perlprefix${PERL5LIB:+:$PERL5LIB}"
 
 	if [ -f "${wrksrc}/Makefile.PL" ]; then
 		sed -i "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" "${wrksrc}/Makefile.PL"

From 80e3c82dfaac804721dfc04a82e30788110f4d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 5 Feb 2021 16:45:10 +0700
Subject: [PATCH 2/2] perl-Crypt-DH: fix ftbfs

---
 srcpkgs/perl-Crypt-DH/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/perl-Crypt-DH/template b/srcpkgs/perl-Crypt-DH/template
index 95fe7e66836..5c9404bb198 100644
--- a/srcpkgs/perl-Crypt-DH/template
+++ b/srcpkgs/perl-Crypt-DH/template
@@ -13,3 +13,7 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Crypt-DH"
 distfiles="${CPAN_SITE}/Crypt/Crypt-DH-${version}.tar.gz"
 checksum=c88cf3423b01e6782e8986d7fe5304436ab84b0925c4498c6fdfa17ef9a37f5f
+
+pre_configure() {
+	export PERL5LIB=$wrksrc
+}