haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

perl: don't create the site install dirs in non-packaged

Browse Source 
That directory isn't needed any more after removing the sitecustomize.pl script.
cpan creates it on demand automatically when installing a package if it doesn't exist.

Fixes #10834.
This commit is contained in:
Joachim Mairböck
2024-08-18 16:45:43 +02:00
parent 24bd140e29
commit ddcebd047b
2 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
dev-lang/perl/patches/perl-5.40.0.patchset
View File

@@ -1,4 +1,4 @@
From 47cb91c06ce16202c77d993a868b438a3447457c Mon Sep 17 00:00:00 2001
From dde920b116870edc767a9af10576a248a5abcd22 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 22 Sep 2013 14:52:03 +0200
Subject: Tell perl that BFS has a link count of 1
@@ -22,7 +22,7 @@ index 570f25a..81baf48 100644
2.45.2
From e666bf26ea943beb78e63b8924cc22b3c87fd16b Mon Sep 17 00:00:00 2001
From 76042fc4376ad707db26771d533bb181fc3b38b6 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 22 Sep 2013 14:52:53 +0200
Subject: Haiku defines, but does not implement O_EXLOCK
@@ -46,7 +46,7 @@ index 7bcd491..85260b8 100644
2.45.2
From bd0cf9a111fee79e30db649c0fd64a412983ebef Mon Sep 17 00:00:00 2001
From 36fa9089744ad31dd650002b06202310b1c1c55d Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 22 Sep 2013 14:53:40 +0200
Subject: haiku sets all its specifics via Configure
@@ -108,7 +108,7 @@ index 0ec7479..0f09f53 100644
2.45.2
From a1509105c2aa953817baca6163e140ede7664f86 Mon Sep 17 00:00:00 2001
From 2ee98b0339d6eb5d51c2046209df473d47f1ad77 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 22 Sep 2013 14:54:15 +0200
Subject: Tell perl that Haiku needs haikuish.h installed as well
@@ -134,7 +134,7 @@ index 3c8af53..1bbbf5b 100755
2.45.2
From 1f852c61168883569f9cd57f8ac39375d2f645da Mon Sep 17 00:00:00 2001
From 85a47997825bfa4c953238931af9d8f607c457b6 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 22 Sep 2013 14:55:13 +0200
Subject: Fix handling of exit codes on Haiku
@@ -185,7 +185,7 @@ index ce3270e..cab9a79 100644
2.45.2
From 1711cdfee02e1fa7cf605d566fa9f29149bf664d Mon Sep 17 00:00:00 2001
From f586ccec51cf9df4e518c4fd811b44636101da99 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sat, 28 Sep 2013 13:46:42 +0200
Subject: Adjust ExtUtils::MakeMaker for PM-Haiku.
@@ -289,7 +289,7 @@ index 0000000..81e5f99
2.45.2
From 06c59a8fe30f636c04eb6fdb9a9e16cf73e1ca5a Mon Sep 17 00:00:00 2001
From 5cefecb333b4b46b51df918bf0adbac0224d055f Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Tue, 8 Oct 2013 22:16:37 +0200
Subject: Avoid using -rpath for dynamic modules.
@@ -337,7 +337,7 @@ index 81e5f99..25ace13 100644
2.45.2
From fa168cb4959d74fa5556953345179a0ea49df12b Mon Sep 17 00:00:00 2001
From a868e28ee01a83dab3e46239a4003b60bb2a9985 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Wed, 9 Oct 2013 20:29:38 +0200
Subject: Fix initialization check for CPAN.
@@ -367,7 +367,7 @@ index 8934f4a..1716a55 100644
2.45.2
From 75b0626f97c369375a5c053490668d2394687f7d Mon Sep 17 00:00:00 2001
From bffe5a3bcfffd0389a3e6bff48e466f79cfbdd1d Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 13 Oct 2013 17:32:50 +0200
Subject: Add support for HAIKU_USE_VENDOR_DIRECTORIES.
@@ -443,7 +443,7 @@ index 25ace13..8a04ead 100644
2.45.2
From 221d74823312c786941f2a13dd05d6d3fd4f5c99 Mon Sep 17 00:00:00 2001
From c686b18200fe8c3b9bd067ab8ac4eaa9fbb08ae7 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 9 Jun 2017 21:30:33 +0200
Subject: disable fstack-protector for Haiku
@@ -462,7 +462,7 @@ index 0f09f53..b76c7c1 100644
2.45.2
From a73fe0c326cc748cfa9252e521232f2f76e10305 Mon Sep 17 00:00:00 2001
From f4690e180128492d89c1db49bf5ac5a36bbf0162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sat, 22 Jun 2024 22:24:38 +0200
Subject: disable some reentrant variants of functions which we don't have
@@ -502,7 +502,7 @@ index 4b13cc2..931eca2 100644
2.45.2
From 5469fa424d3bf9932d1e314a073e314511c60bf1 Mon Sep 17 00:00:00 2001
From 8986e0fbc38c61f67f6c6a58330c31910e5d3b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sat, 22 Jun 2024 22:25:46 +0200
Subject: disable check involving sizeof(dirent.d_name)
@@ -533,7 +533,7 @@ index 0b3d142..880a108 100644
2.45.2
From e6b8ce27e3368f7f84010da2203d28e138bab7d5 Mon Sep 17 00:00:00 2001
From 1e3fb86660fbb2a63dfbff5a3e880261e877d4aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 28 Jul 2024 21:30:57 +0200
Subject: Reinit mutexes after a fork()
@@ -661,7 +661,7 @@ index 4053ca4..e4e9d55 100644
2.45.2
From 78574420f168c0443b8f79763ee79f43977b7ac5 Mon Sep 17 00:00:00 2001
From 656bb387be7998de48ec31f637e605bc05162623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 4 Aug 2024 12:14:53 +0200
Subject: fix the using of our custom shebang for installed scripts
@@ -745,3 +745,31 @@ index 8a04ead..bd3d5fa 100644
--
2.45.2
From 9751cb49414351044173e5428a4f324c4dd256b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 18 Aug 2024 16:42:30 +0200
Subject: don't install the site installation directories (non-packaged)
They are created automatically by cpan on demand if needed.
diff --git a/installperl b/installperl
index 1bbbf5b..7191a44 100755
--- a/installperl
+++ b/installperl
@@ -296,8 +296,10 @@ $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$vershort/);
mkpath($installprivlib);
mkpath($installarchlib);
-mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib);
-mkpath($installsitearch, $opts{verbose}, 0777) if ($installsitearch);
+unless ($^O eq 'haiku') {
+ mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib);
+ mkpath($installsitearch, $opts{verbose}, 0777) if ($installsitearch);
+}
if (-d 'lib') {
find({no_chdir => 1, wanted => \&installlib}, 'lib')
--
2.45.2

6
dev-lang/perl/perl-5.40.0.recipe
View File

@@ -16,7 +16,7 @@ HOMEPAGE="https://www.perl.org/"
COPYRIGHT="1993-2024 Larry Wall and others"
LICENSE="GNU GPL v1
Artistic"
REVISION="3"
REVISION="4"
perlShortVersion="${portVersion%.*}"
SOURCE_URI="http://www.cpan.org/src/perl-$portVersion.tar.gz"
CHECKSUM_SHA256="c740348f357396327a9795d3e8323bafd0fe8a5c7835fc1cbaba0cc8dfe7161f"
@@ -89,10 +89,6 @@ BUILD_PREREQUIRES="
perlArchName="$(uname -m)-haiku-thread-multi"
GLOBAL_WRITABLE_FILES="
non-packaged/lib/perl5/site_perl/$perlShortVersion/$perlArchName directory keep-old
"
BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
BUILD()