* [PR PATCH] build-style/perl-module: prepend not reset PERL5LIB
@ 2021-02-05 9:46 sgn
2021-02-05 9:51 ` [PR PATCH] [Updated] " sgn
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: sgn @ 2021-02-05 9:46 UTC (permalink / raw)
To: ml
[-- 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
+}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] build-style/perl-module: prepend not reset PERL5LIB
2021-02-05 9:46 [PR PATCH] build-style/perl-module: prepend not reset PERL5LIB sgn
@ 2021-02-05 9:51 ` sgn
2021-02-05 9:58 ` sgn
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: sgn @ 2021-02-05 9:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
There is an updated 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: 2668 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/3] 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/3] 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
+}
From fe6d67143095fdee4b92a4bc03a4d5d48700dc36 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:50:20 +0700
Subject: [PATCH 3/3] perl-Curses-UI: fix ftbfs
---
srcpkgs/perl-Curses-UI/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/perl-Curses-UI/template b/srcpkgs/perl-Curses-UI/template
index ded40680509..132b0b140e0 100644
--- a/srcpkgs/perl-Curses-UI/template
+++ b/srcpkgs/perl-Curses-UI/template
@@ -13,3 +13,7 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Curses"
distfiles="${CPAN_SITE}/Curses/${pkgname/perl-/}-${version}.tar.gz"
checksum=0ab827a513b6e14403184fb065a8ea1d2ebda122d2178cbf45c781f311240eaf
+
+pre_configure() {
+ export PERL5LIB=$wrksrc
+}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] build-style/perl-module: prepend not reset PERL5LIB
2021-02-05 9:46 [PR PATCH] build-style/perl-module: prepend not reset PERL5LIB sgn
2021-02-05 9:51 ` [PR PATCH] [Updated] " sgn
@ 2021-02-05 9:58 ` sgn
2021-02-05 9:58 ` sgn
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: sgn @ 2021-02-05 9:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
There is an updated 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: 1150 bytes --]
From d102d4137cf8905f91c46ccbf00645423af7ba48 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] build-style/perl-module: append $PERL5LIB and $wrksrc into
PERL5LIB
Fixing those build failure:
- perl-Crypt-DH
- perl-Curses-UI
- perl-Data-MessagePack
- perl-Encode-HanExtra
- perl-Gtk2-Notify
- perl-Plack-Middleware-Deflater
- perl-Text-Markdown
- perl-WWW-Curl
---
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..8a4a4328644 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}:$wrksrc"
if [ -f "${wrksrc}/Makefile.PL" ]; then
sed -i "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" "${wrksrc}/Makefile.PL"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: build-style/perl-module: prepend not reset PERL5LIB
2021-02-05 9:46 [PR PATCH] build-style/perl-module: prepend not reset PERL5LIB sgn
2021-02-05 9:51 ` [PR PATCH] [Updated] " sgn
2021-02-05 9:58 ` sgn
@ 2021-02-05 9:58 ` sgn
2021-02-05 10:11 ` leahneukirchen
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: sgn @ 2021-02-05 9:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/28513#issuecomment-773928058
Comment:
@pullmoll this change fix those perl build failure in your repo. I haven't thought about the cross compilation.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: build-style/perl-module: prepend not reset PERL5LIB
2021-02-05 9:46 [PR PATCH] build-style/perl-module: prepend not reset PERL5LIB sgn
` (2 preceding siblings ...)
2021-02-05 9:58 ` sgn
@ 2021-02-05 10:11 ` leahneukirchen
2021-02-05 10:13 ` leahneukirchen
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: leahneukirchen @ 2021-02-05 10:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/28513#issuecomment-773935544
Comment:
I think fixing those builds ala 5c920dac747 is better.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: build-style/perl-module: prepend not reset PERL5LIB
2021-02-05 9:46 [PR PATCH] build-style/perl-module: prepend not reset PERL5LIB sgn
` (3 preceding siblings ...)
2021-02-05 10:11 ` leahneukirchen
@ 2021-02-05 10:13 ` leahneukirchen
2021-02-05 10:14 ` leahneukirchen
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: leahneukirchen @ 2021-02-05 10:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/28513#issuecomment-773935544
Comment:
I think fixing those builds ala 5c920dac747 is better.
cf. https://rt.cpan.org/Public/Bug/Display.html?id=122110
https://github.com/bobtfish/text-markdown/issues/41
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: build-style/perl-module: prepend not reset PERL5LIB
2021-02-05 9:46 [PR PATCH] build-style/perl-module: prepend not reset PERL5LIB sgn
` (4 preceding siblings ...)
2021-02-05 10:13 ` leahneukirchen
@ 2021-02-05 10:14 ` leahneukirchen
2021-02-05 10:20 ` sgn
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: leahneukirchen @ 2021-02-05 10:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/28513#issuecomment-773937380
Comment:
Alternatively we could pass `-I.`, it should not do harm here.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: build-style/perl-module: prepend not reset PERL5LIB
2021-02-05 9:46 [PR PATCH] build-style/perl-module: prepend not reset PERL5LIB sgn
` (5 preceding siblings ...)
2021-02-05 10:14 ` leahneukirchen
@ 2021-02-05 10:20 ` sgn
2021-02-05 10:23 ` [PR PATCH] [Updated] " sgn
2021-02-06 6:11 ` [PR PATCH] [Merged]: build-style/perl-module: put . into @INC sgn
8 siblings, 0 replies; 10+ messages in thread
From: sgn @ 2021-02-05 10:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1198 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/28513#issuecomment-773940497
Comment:
I guess you meant:
```diff
diff --git a/common/build-style/perl-module.sh b/common/build-style/perl-module.sh
index 8a4a432864..2611e0b8e0 100644
--- a/common/build-style/perl-module.sh
+++ b/common/build-style/perl-module.sh
@@ -45,7 +45,7 @@ do_configure() {
CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \
LDFLAGS="$LDFLAGS -L${XBPS_CROSS_BASE}/usr/lib -lperl" \
LDDLFLAGS="-shared $CFLAGS -L${XBPS_CROSS_BASE}/usr/lib" \
- perl Makefile.PL ${configure_args} INSTALLDIRS=vendor
+ perl -I. Makefile.PL ${configure_args} INSTALLDIRS=vendor
fi
for i in ${perl_configure_dirs}; do
@@ -57,7 +57,7 @@ do_configure() {
CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \
LDFLAGS="$LDFLAGS -L${XBPS_CROSS_BASE}/usr/lib -lperl" \
LDDLFLAGS="-shared $CFLAGS -L${XBPS_CROSS_BASE}/usr/lib -lperl" \
- perl Makefile.PL ${make_build_args} INSTALLDIRS=vendor
+ perl -I. Makefile.PL ${make_build_args} INSTALLDIRS=vendor
else
msg_error "*** ERROR: couldn't find $perlmkf, aborting **\n"
fi
```
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] build-style/perl-module: prepend not reset PERL5LIB
2021-02-05 9:46 [PR PATCH] build-style/perl-module: prepend not reset PERL5LIB sgn
` (6 preceding siblings ...)
2021-02-05 10:20 ` sgn
@ 2021-02-05 10:23 ` sgn
2021-02-06 6:11 ` [PR PATCH] [Merged]: build-style/perl-module: put . into @INC sgn
8 siblings, 0 replies; 10+ messages in thread
From: sgn @ 2021-02-05 10:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
There is an updated 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: 1563 bytes --]
From a135906307579c42f0cd565b42de35a2a53dcd54 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] build-style/perl-module: put . into @INC
Fixing those build failure:
- perl-Crypt-DH
- perl-Curses-UI
- perl-Data-MessagePack
- perl-Encode-HanExtra
- perl-Gtk2-Notify
- perl-Plack-Middleware-Deflater
- perl-Text-Markdown
- perl-WWW-Curl
---
common/build-style/perl-module.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/build-style/perl-module.sh b/common/build-style/perl-module.sh
index c2d5b8ddeca..5b0f0ccde82 100644
--- a/common/build-style/perl-module.sh
+++ b/common/build-style/perl-module.sh
@@ -45,7 +45,7 @@ do_configure() {
CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \
LDFLAGS="$LDFLAGS -L${XBPS_CROSS_BASE}/usr/lib -lperl" \
LDDLFLAGS="-shared $CFLAGS -L${XBPS_CROSS_BASE}/usr/lib" \
- perl Makefile.PL ${configure_args} INSTALLDIRS=vendor
+ perl -I. Makefile.PL ${configure_args} INSTALLDIRS=vendor
fi
for i in ${perl_configure_dirs}; do
@@ -57,7 +57,7 @@ do_configure() {
CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \
LDFLAGS="$LDFLAGS -L${XBPS_CROSS_BASE}/usr/lib -lperl" \
LDDLFLAGS="-shared $CFLAGS -L${XBPS_CROSS_BASE}/usr/lib -lperl" \
- perl Makefile.PL ${make_build_args} INSTALLDIRS=vendor
+ perl -I. Makefile.PL ${make_build_args} INSTALLDIRS=vendor
else
msg_error "*** ERROR: couldn't find $perlmkf, aborting **\n"
fi
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Merged]: build-style/perl-module: put . into @INC
2021-02-05 9:46 [PR PATCH] build-style/perl-module: prepend not reset PERL5LIB sgn
` (7 preceding siblings ...)
2021-02-05 10:23 ` [PR PATCH] [Updated] " sgn
@ 2021-02-06 6:11 ` sgn
8 siblings, 0 replies; 10+ messages in thread
From: sgn @ 2021-02-06 6:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
There's a merged pull request on the void-packages repository
build-style/perl-module: put . into @INC
https://github.com/void-linux/void-packages/pull/28513
Description:
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-02-06 6:11 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-05 9:46 [PR PATCH] build-style/perl-module: prepend not reset PERL5LIB sgn
2021-02-05 9:51 ` [PR PATCH] [Updated] " sgn
2021-02-05 9:58 ` sgn
2021-02-05 9:58 ` sgn
2021-02-05 10:11 ` leahneukirchen
2021-02-05 10:13 ` leahneukirchen
2021-02-05 10:14 ` leahneukirchen
2021-02-05 10:20 ` sgn
2021-02-05 10:23 ` [PR PATCH] [Updated] " sgn
2021-02-06 6:11 ` [PR PATCH] [Merged]: build-style/perl-module: put . into @INC sgn
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).