* [gentoo-commits] repo/proj/prefix:master commit in: dev-lang/perl/files/, dev-lang/perl/
@ 2020-11-27 18:33 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-11-27 18:33 UTC (permalink / raw
To: gentoo-commits
commit: be06f6b8434f7dcbf18e0c6645e250c905def7fd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 18:33:21 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 18:33:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=be06f6b8
dev-lang/perl: drop AUTHORS hunk from patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/perl/Manifest | 4 ++--
.../perl/files/perl-5.30.3-darwin-macos11.patch | 22 ----------------------
2 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 8456aeadfa..be112228af 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,7 +1,7 @@
AUX perl-5.26.2-hppa.patch 3231 BLAKE2B d59eab55eea3daceb0d3df39778d43ebaee2c065c052ca048ec17c06fa90049eb7fd5ae40092f11248de25cdf9cff96dc69626e7f3269b24cf618004deeb5859 SHA512 24856ae3c637c58d16d543240f5028e137c33c7aeae7c0c3dfa1a69b621057a84ab4ddf8b12ac6ef251381af4b190c200262bec9bdaa6001199dbd1d15cf4bae
-AUX perl-5.30.3-darwin-macos11.patch 7053 BLAKE2B 33b99663d49675c90e7c6630a41a59419c5ea5692a230f5948346bb20792663ac6b927a398b7be3f250dc594576a82395f2a0e38bec64282e73bec63812ae65b SHA512 facf795ee83dbcfed4bb305e35ea7fcfd37e608947ff3af4671a9533ae64f5bd3e5f94aaf3635decd35d5807eeb5166b2bf968e178308361a5bdd4b682bb6149
+AUX perl-5.30.3-darwin-macos11.patch 6291 BLAKE2B ac3e6fdce8f99540eafc88928490d12155e78080000666417af049c6d9db129df6bc492c03aa42739f4a3e8715ab23b92100418f5e14baccf8fb96dd524f6685 SHA512 8d4872d3034615300ad3452e4b9ca9a8b20cdd7bc0cee510b1e2966176a88f46190d977c547a26422c15ffb3f6892f094b20aa77bd77732d38d55cbf4e393b2d
DIST perl-5.30.0-patches-1.tar.xz 17352 BLAKE2B 67eb1c4ce6ada27e05962d06fa9c5675ca1d22623b5fd172ce8ceaa17f2e51d61f9451955f9f6acf6d97ea7d71c72b583be1378ccbf9174c88580baec2049a48 SHA512 4fe1f2de5e72e56890858148d20b772df63dce34cb3977ec47d8ed5323c4843929130f660f1558c282c97e65efa1c6d2fdacf9e2dcc0ef1d487a0b69dbb5bbb4
DIST perl-5.30.3.tar.xz 12375128 BLAKE2B ff0668c896e46ea35a1b8bd4a7d800c8668d6995185cd8c43fca332da2fa63965bb5276b2d5cf9738c0b7fb735140f6e33f1b4582899017903f86753065f417b SHA512 0ea62cf17532ee99217a218c39aa530472857c7a1982494f3a01693683062b4cdebe383a79f7b64452c713337b554ed5e0fd6eda018ea29e83c3538a13c24f3c
DIST perl-cross-1.3.4.tar.gz 108461 BLAKE2B 28f207d235f51ebf681598cf85f7f16923574aafb593426a59d67578135ee3632efb12b9e1a672759195a79f80e49f5c929ec42b2b4571b1d36f5d8c8dceadc2 SHA512 7e1fc7b2b19d8c2e2fb8615e074e218b2e1a4d276b563ffabccfd0c7398bc8680fca96da89cc61d611993f38a2c67dfbb0201c58658e05437395ad8c00d31874
-EBUILD perl-5.30.3-r1.ebuild 20666 BLAKE2B 4a949d11ed0a50d6da702794fde1d75b34b95ee716a9cb93eae334a25d933a9f29db67d26741ddb29be14d34c096d1b40f89b9004ab347f2ef8ad6c8f17c188c SHA512 62de1bffeb6e6b0db832595a2641e5922f4495323769c56345ca344432eec259285fa2cb85889a3dd4adc2f430f39a22f019d38aa5580f078bf95ccdc430c666
+EBUILD perl-5.30.3-r1.ebuild 20668 BLAKE2B d2948913f8eb8b9f5a9515ad3ef5078d312b607f51e1a8235468c07463f2a28216022ff845de71ee866818c1702574a6c051e7451e92e6f9f3d294e2c3bde7e9 SHA512 d0dbcf745a4b130456da6bd284b218315bebe5c014bff58cbf6ea9ed9decefd8f185b70934a710ce38762c1ba9f9a070d61e622fb55f6568f33a3fa069082d6c
MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583
diff --git a/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch b/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
index e57effda5f..08a2b436ca 100644
--- a/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
+++ b/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
@@ -30,28 +30,6 @@ index 0a91bc083c0..c0f06de1cab 100644
add_macosx_version_min ldflags $prodvers
;;
-From a54d28f327d6431768994d49173afe479e17acc7 Mon Sep 17 00:00:00 2001
-From: Adam Hartley <git@ahartley.com>
-Date: Wed, 8 Jul 2020 19:04:45 +0100
-Subject: [PATCH 2/7] Update AUTHORS
-
----
- AUTHORS | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/AUTHORS b/AUTHORS
-index e4ea405d985..a05246b0474 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -31,6 +31,7 @@ Abir Viqar <abiviq@hushmail.com>
- Achim Bohnet <ach@mpe.mpg.de>
- Achim Gratz <achim.gratz@stromeko.de>
- Adam Flott <adam@npjh.com>
-+Adam Hartley <git@ahartley.com>
- Adam Kennedy <adam@ali.as>
- Adam Krolnik <adamk@gypsy.cyrix.com>
- Adam Milner <carmiac@nmt.edu>
-
From 960d1a5c4225d1dd12636a469e10a568464e4e7c Mon Sep 17 00:00:00 2001
From: Adam Hartley <git@ahartley.com>
Date: Wed, 8 Jul 2020 19:10:33 +0100
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: dev-lang/perl/files/, dev-lang/perl/
@ 2020-12-11 20:28 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-12-11 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 4474f73698e8f1585d97d36ff4938aa41ef8d1b2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 11 20:28:44 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 20:28:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4474f736
dev-lang/perl: add upstream patch reference (for macOS)
Including the inadvertently left-out link to the
upstream patch source.
Bug: https://bugs.gentoo.org/757249
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/perl/Manifest | 4 ++++
dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch | 3 +++
2 files changed, 7 insertions(+)
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index d529a52ba0..2156e2424d 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,3 +1,7 @@
+AUX perl-5.26.2-hppa.patch 3231 BLAKE2B d59eab55eea3daceb0d3df39778d43ebaee2c065c052ca048ec17c06fa90049eb7fd5ae40092f11248de25cdf9cff96dc69626e7f3269b24cf618004deeb5859 SHA512 24856ae3c637c58d16d543240f5028e137c33c7aeae7c0c3dfa1a69b621057a84ab4ddf8b12ac6ef251381af4b190c200262bec9bdaa6001199dbd1d15cf4bae
+AUX perl-5.30.3-darwin-macos11.patch 6367 BLAKE2B 5fb6a34bf5e422ba4a5f76d9462328fb81e44e6de7dc363ad595d9315ac622d5eb2973700e3eb209f630bfd2d002adfe33f1a3a10f7c5818ed44fc3a26bd55d5 SHA512 c8d88c2f21b781e777ca19115eedecdf4d8bc0f93b01da6da578be489e0151f3ab7d3204e6b7a28848f9286bad90bcf6f33edc63be82949060e06fc6c739fb7f
DIST perl-5.30.0-patches-1.tar.xz 17352 BLAKE2B 67eb1c4ce6ada27e05962d06fa9c5675ca1d22623b5fd172ce8ceaa17f2e51d61f9451955f9f6acf6d97ea7d71c72b583be1378ccbf9174c88580baec2049a48 SHA512 4fe1f2de5e72e56890858148d20b772df63dce34cb3977ec47d8ed5323c4843929130f660f1558c282c97e65efa1c6d2fdacf9e2dcc0ef1d487a0b69dbb5bbb4
DIST perl-5.30.3.tar.xz 12375128 BLAKE2B ff0668c896e46ea35a1b8bd4a7d800c8668d6995185cd8c43fca332da2fa63965bb5276b2d5cf9738c0b7fb735140f6e33f1b4582899017903f86753065f417b SHA512 0ea62cf17532ee99217a218c39aa530472857c7a1982494f3a01693683062b4cdebe383a79f7b64452c713337b554ed5e0fd6eda018ea29e83c3538a13c24f3c
DIST perl-cross-1.3.4.tar.gz 108461 BLAKE2B 28f207d235f51ebf681598cf85f7f16923574aafb593426a59d67578135ee3632efb12b9e1a672759195a79f80e49f5c929ec42b2b4571b1d36f5d8c8dceadc2 SHA512 7e1fc7b2b19d8c2e2fb8615e074e218b2e1a4d276b563ffabccfd0c7398bc8680fca96da89cc61d611993f38a2c67dfbb0201c58658e05437395ad8c00d31874
+EBUILD perl-5.30.3-r1.ebuild 20666 BLAKE2B 4a949d11ed0a50d6da702794fde1d75b34b95ee716a9cb93eae334a25d933a9f29db67d26741ddb29be14d34c096d1b40f89b9004ab347f2ef8ad6c8f17c188c SHA512 62de1bffeb6e6b0db832595a2641e5922f4495323769c56345ca344432eec259285fa2cb85889a3dd4adc2f430f39a22f019d38aa5580f078bf95ccdc430c666
+MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583
diff --git a/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch b/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
index 08a2b436ca..73879b398c 100644
--- a/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
+++ b/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
@@ -1,3 +1,6 @@
+https://github.com/Perl/perl5/pull/17946
+https://bugs.gentoo.org/757249
+---
From b382aafc793fe1007f9058a5145a1d39d56cef70 Mon Sep 17 00:00:00 2001
From: Adam Hartley <git@ahartley.com>
Date: Mon, 6 Jul 2020 22:59:42 +0100
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: dev-lang/perl/files/, dev-lang/perl/
@ 2020-12-26 13:41 Fabian Groffen
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen @ 2020-12-26 13:41 UTC (permalink / raw
To: gentoo-commits
commit: bbe987a7090818fff67bf2e0d6fc7e31226ef507
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 13:41:28 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 13:41:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bbe987a7
dev-lang/perl: migrated to gx86
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
dev-lang/perl/Manifest | 3 -
dev-lang/perl/files/perl-5.26.2-hppa.patch | 105 ----
.../perl/files/perl-5.30.3-darwin-macos11.patch | 180 ------
dev-lang/perl/metadata.xml | 14 -
dev-lang/perl/perl-5.30.3-r1.ebuild | 664 ---------------------
5 files changed, 966 deletions(-)
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
deleted file mode 100644
index d529a52ba0..0000000000
--- a/dev-lang/perl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST perl-5.30.0-patches-1.tar.xz 17352 BLAKE2B 67eb1c4ce6ada27e05962d06fa9c5675ca1d22623b5fd172ce8ceaa17f2e51d61f9451955f9f6acf6d97ea7d71c72b583be1378ccbf9174c88580baec2049a48 SHA512 4fe1f2de5e72e56890858148d20b772df63dce34cb3977ec47d8ed5323c4843929130f660f1558c282c97e65efa1c6d2fdacf9e2dcc0ef1d487a0b69dbb5bbb4
-DIST perl-5.30.3.tar.xz 12375128 BLAKE2B ff0668c896e46ea35a1b8bd4a7d800c8668d6995185cd8c43fca332da2fa63965bb5276b2d5cf9738c0b7fb735140f6e33f1b4582899017903f86753065f417b SHA512 0ea62cf17532ee99217a218c39aa530472857c7a1982494f3a01693683062b4cdebe383a79f7b64452c713337b554ed5e0fd6eda018ea29e83c3538a13c24f3c
-DIST perl-cross-1.3.4.tar.gz 108461 BLAKE2B 28f207d235f51ebf681598cf85f7f16923574aafb593426a59d67578135ee3632efb12b9e1a672759195a79f80e49f5c929ec42b2b4571b1d36f5d8c8dceadc2 SHA512 7e1fc7b2b19d8c2e2fb8615e074e218b2e1a4d276b563ffabccfd0c7398bc8680fca96da89cc61d611993f38a2c67dfbb0201c58658e05437395ad8c00d31874
diff --git a/dev-lang/perl/files/perl-5.26.2-hppa.patch b/dev-lang/perl/files/perl-5.26.2-hppa.patch
deleted file mode 100644
index 83ed944353..0000000000
--- a/dev-lang/perl/files/perl-5.26.2-hppa.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-https://bugs.gentoo.org/634162
-
-Source:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869122
-
-Index: perl-5.26.0/op.c
-===================================================================
---- perl-5.26.0.orig/op.c
-+++ perl-5.26.0/op.c
-@@ -14832,6 +14832,7 @@ Perl_custom_op_get_field(pTHX_ const OP
- SV *keysv;
- HE *he = NULL;
- XOP *xop;
-+ XOPRETANY any;
-
- static const XOP xop_null = { 0, 0, 0, 0, 0 };
-
-@@ -14874,58 +14875,37 @@ Perl_custom_op_get_field(pTHX_ const OP
- else
- xop = INT2PTR(XOP *, SvIV(HeVAL(he)));
- }
-- {
-- XOPRETANY any;
-- if(field == XOPe_xop_ptr) {
-- any.xop_ptr = xop;
-- } else {
-- const U32 flags = XopFLAGS(xop);
-- if(flags & field) {
-- switch(field) {
-- case XOPe_xop_name:
-- any.xop_name = xop->xop_name;
-- break;
-- case XOPe_xop_desc:
-- any.xop_desc = xop->xop_desc;
-- break;
-- case XOPe_xop_class:
-- any.xop_class = xop->xop_class;
-- break;
-- case XOPe_xop_peep:
-- any.xop_peep = xop->xop_peep;
-- break;
-- default:
-- NOT_REACHED; /* NOTREACHED */
-- break;
-- }
-- } else {
-- switch(field) {
-- case XOPe_xop_name:
-- any.xop_name = XOPd_xop_name;
-- break;
-- case XOPe_xop_desc:
-- any.xop_desc = XOPd_xop_desc;
-- break;
-- case XOPe_xop_class:
-- any.xop_class = XOPd_xop_class;
-- break;
-- case XOPe_xop_peep:
-- any.xop_peep = XOPd_xop_peep;
-- break;
-- default:
-- NOT_REACHED; /* NOTREACHED */
-- break;
-- }
-- }
-+
-+ if(field == XOPe_xop_ptr) {
-+ any.xop_ptr = xop;
-+ } else {
-+ const U32 flags = XopFLAGS(xop);
-+ switch(field) {
-+ case XOPe_xop_name:
-+ any.xop_name = (flags & field) ? xop->xop_name : XOPd_xop_name;
-+ break;
-+ case XOPe_xop_desc:
-+ any.xop_desc = (flags & field) ? xop->xop_desc : XOPd_xop_desc;
-+ break;
-+ case XOPe_xop_class:
-+ any.xop_class = (flags & field) ? xop->xop_class : XOPd_xop_class;
-+ break;
-+ case XOPe_xop_peep:
-+ any.xop_peep = (flags & field) ? xop->xop_peep : XOPd_xop_peep;
-+ break;
-+ default:
-+ NOT_REACHED; /* NOTREACHED */
-+ break;
- }
-- /* On some platforms (HP-UX, IA64) gcc emits a warning for this function:
-- * op.c: In function 'Perl_custom_op_get_field':
-- * op.c:...: warning: 'any.xop_name' may be used uninitialized in this function [-Wmaybe-uninitialized]
-- * This is because on those platforms (with -DEBUGGING) NOT_REACHED
-- * expands to assert(0), which expands to ((0) ? (void)0 :
-- * __assert(...)), and gcc doesn't know that __assert can never return. */
-- return any;
- }
-+
-+ /* On some platforms (HP-UX, IA64) gcc emits a warning for this function:
-+ * op.c: In function 'Perl_custom_op_get_field':
-+ * op.c:...: warning: 'any.xop_name' may be used uninitialized in this function [-Wmaybe-uninitialized]
-+ * This is because on those platforms (with -DEBUGGING) NOT_REACHED
-+ * expands to assert(0), which expands to ((0) ? (void)0 :
-+ * __assert(...)), and gcc doesn't know that __assert can never return. */
-+ return any;
- }
-
- /*
diff --git a/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch b/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
deleted file mode 100644
index 73879b398c..0000000000
--- a/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-https://github.com/Perl/perl5/pull/17946
-https://bugs.gentoo.org/757249
----
-From b382aafc793fe1007f9058a5145a1d39d56cef70 Mon Sep 17 00:00:00 2001
-From: Adam Hartley <git@ahartley.com>
-Date: Mon, 6 Jul 2020 22:59:42 +0100
-Subject: [PATCH 1/7] Add 11.x support for darwin.sh
-
----
- hints/darwin.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index 0a91bc083c0..c0f06de1cab 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
- # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
- # capturing its value and adding it to the flags.
- case "$MACOSX_DEPLOYMENT_TARGET" in
-- 10.*)
-+ 10.* | 11.*)
- add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
- add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
- ;;
-@@ -327,7 +327,7 @@ EOM
- # "ProductVersion: 10.11" "10.11"
- prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
- case "$prodvers" in
-- 10.*)
-+ 10.* | 11.*)
- add_macosx_version_min ccflags $prodvers
- add_macosx_version_min ldflags $prodvers
- ;;
-
-From 960d1a5c4225d1dd12636a469e10a568464e4e7c Mon Sep 17 00:00:00 2001
-From: Adam Hartley <git@ahartley.com>
-Date: Wed, 8 Jul 2020 19:10:33 +0100
-Subject: [PATCH 3/7] Update error message
-
----
- hints/darwin.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index c0f06de1cab..988b766c4f4 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
-
- *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
- ***
--*** Please either set it to 10.something, or to empty.
-+*** Please either set it to 10.something, 11.something or to empty.
-
- EOM
- exit 1
-
-From d633cced1d5174e19c5f2234a9fb4c7603cfb9db Mon Sep 17 00:00:00 2001
-From: Adam Hartley <git@ahartley.com>
-Date: Sat, 11 Jul 2020 11:41:27 +0100
-Subject: [PATCH 4/7] Update deprecated syscall check for 11.x and greater
-
----
- hints/darwin.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index 988b766c4f4..4f73a9995e7 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -342,11 +342,11 @@ EOM
- exit 1
- esac
-
-- # The X in 10.X
-+ prodvers_major=$(echo $prodvers|awk -F. '{print $1}')
- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
-
- # macOS (10.12) deprecated syscall().
-- if [ "$prodvers_minor" -ge 12 ]; then
-+ if [[ ( "$prodvers_minor" -ge 12 && "$prodvers_major" -eq 10 ) || "$prodvers_major" -ge 11 ]]; then
- d_syscall='undef'
- # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
- case "$MACOSX_DEPLOYMENT_TARGET" in
-
-From 9c3890f8521a7db6d9b2aa21561c7d0dae9fb91d Mon Sep 17 00:00:00 2001
-From: Adam Hartley <BytesGuy@users.noreply.github.com>
-Date: Wed, 22 Jul 2020 13:15:30 +0100
-Subject: [PATCH 5/7] Simplify syscall check
-
----
- hints/darwin.sh | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index 4f73a9995e7..40c84cf267a 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -342,11 +342,10 @@ EOM
- exit 1
- esac
-
-- prodvers_major=$(echo $prodvers|awk -F. '{print $1}')
-- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
-+ darwin_major=$(echo $osvers|awk -F. '{print $1}')
-
-- # macOS (10.12) deprecated syscall().
-- if [[ ( "$prodvers_minor" -ge 12 && "$prodvers_major" -eq 10 ) || "$prodvers_major" -ge 11 ]]; then
-+ # macOS 10.12 (darwin 6.0.0) deprecated syscall().
-+ if [ "$darwin_major" -ge 6 ]; then
- d_syscall='undef'
- # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
- case "$MACOSX_DEPLOYMENT_TARGET" in
-
-From 99ff8934992102a3db63805e8ba9710577de164e Mon Sep 17 00:00:00 2001
-From: Adam Hartley <BytesGuy@users.noreply.github.com>
-Date: Wed, 22 Jul 2020 13:15:53 +0100
-Subject: [PATCH 6/7] Update darwin.sh
-
----
- hints/darwin.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index 40c84cf267a..1709d224f7c 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -344,8 +344,8 @@ EOM
-
- darwin_major=$(echo $osvers|awk -F. '{print $1}')
-
-- # macOS 10.12 (darwin 6.0.0) deprecated syscall().
-- if [ "$darwin_major" -ge 6 ]; then
-+ # macOS 10.12 (darwin 16.0.0) deprecated syscall().
-+ if [ "$darwin_major" -ge 16 ]; then
- d_syscall='undef'
- # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
- case "$MACOSX_DEPLOYMENT_TARGET" in
-
-From 1b712e4b359d9508461a0a832d06baa6e589b955 Mon Sep 17 00:00:00 2001
-From: Adam Hartley <BytesGuy@users.noreply.github.com>
-Date: Thu, 23 Jul 2020 19:53:07 +0100
-Subject: [PATCH 7/7] Future proof version check
-
----
- hints/darwin.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/hints/darwin.sh b/hints/darwin.sh
-index 1709d224f7c..fdfbdd4a3b9 100644
---- a/hints/darwin.sh
-+++ b/hints/darwin.sh
-@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
- # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
- # capturing its value and adding it to the flags.
- case "$MACOSX_DEPLOYMENT_TARGET" in
-- 10.* | 11.*)
-+ [1-9][0-9].*)
- add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
- add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
- ;;
-@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
-
- *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
- ***
--*** Please either set it to 10.something, 11.something or to empty.
-+*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
-
- EOM
- exit 1
-@@ -327,7 +327,7 @@ EOM
- # "ProductVersion: 10.11" "10.11"
- prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
- case "$prodvers" in
-- 10.* | 11.*)
-+ [1-9][0-9].*)
- add_macosx_version_min ccflags $prodvers
- add_macosx_version_min ldflags $prodvers
- ;;
diff --git a/dev-lang/perl/metadata.xml b/dev-lang/perl/metadata.xml
deleted file mode 100644
index 0edcddc60b..0000000000
--- a/dev-lang/perl/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>perl@gentoo.org</email>
- <name>Gentoo Perl Project</name>
- </maintainer>
- <use>
- <flag name="ithreads">Enable Perl threads, has some compatibility problems</flag>
- </use>
- <upstream>
- <remote-id type="github">arsv/perl-cross</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-lang/perl/perl-5.30.3-r1.ebuild b/dev-lang/perl/perl-5.30.3-r1.ebuild
deleted file mode 100644
index 50e4fc346a..0000000000
--- a/dev-lang/perl/perl-5.30.3-r1.ebuild
+++ /dev/null
@@ -1,664 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.4
-PATCH_BASE="perl-5.30.0-patches-${PATCH_VER}"
-PATCH_DEV=dilfridge
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN="5.30.0 5.30.1 5.30.2"
-
-if [[ "${PV##*.}" == "9999" ]]; then
- DIST_VERSION=5.30.0
-else
- DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
- SUBSLOT="${DIST_VERSION%-RC*}"
-else
- SUBSLOT="${DIST_VERSION%.*}"
-fi
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
- mirror://cpan/src/5.0/${MY_P}.tar.xz
- mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
- https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
- mirror://gentoo/${PATCH_BASE}.tar.xz
- https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
- https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads minimal"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( >=sys-libs/gdbm-1.8.3:= )
- app-arch/bzip2
- sys-libs/zlib
- virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
- !minimal? (
- >=app-admin/perl-cleaner-2.5
- >=virtual/perl-File-Temp-0.230.400-r2
- >=virtual/perl-Data-Dumper-2.154.0
- virtual/perl-Test-Harness
- )
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
- src_remove_dual perl-core/Archive-Tar 2.320.0 ptar ptardiff ptargrep
- src_remove_dual perl-core/CPAN 2.220.0 cpan
- src_remove_dual perl-core/Digest-SHA 6.20.0 shasum
- src_remove_dual perl-core/Encode 3.10.0 enc2xs piconv
- src_remove_dual perl-core/ExtUtils-MakeMaker 7.340.0 instmodsh
- src_remove_dual perl-core/ExtUtils-ParseXS 3.400.0 xsubpp
- src_remove_dual perl-core/IO-Compress 2.84.0 zipdetails
- src_remove_dual perl-core/JSON-PP 4.20.0 json_pp
- src_remove_dual perl-core/Module-CoreList 5.202.6.13.0_rc corelist
- src_remove_dual perl-core/Pod-Parser 1.630.0 pod2usage podchecker podselect
- src_remove_dual perl-core/Pod-Perldoc 3.280.100 perldoc
- src_remove_dual perl-core/Test-Harness 3.420.0 prove
- src_remove_dual perl-core/podlators 4.110.0 pod2man pod2text
- src_remove_dual_man perl-core/podlators 4.110.0 /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
- # Fresh install
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- return 0;
- # Major Upgrade
- # doesn't matter if there's multiple copies, it still needs a rebuild
- # if the string is anything other than "5.CURRENTMAJOR"
- elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
- echo ""
- ewarn "UPDATE THE PERL MODULES:"
- ewarn "After updating dev-lang/perl the installed Perl modules"
- ewarn "have to be re-installed. In most cases, this is done automatically"
- ewarn "by the package manager, but subsequent steps are still recommended"
- ewarn "to ensure system consistency."
- ewarn
- ewarn "You should start with a depclean to remove any unused perl dependencies"
- ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
- ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
- ewarn "Recommended: emerge --depclean -va"
- ewarn
- ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
- ewarn "remaining rebuilds portage may have missed."
- ewarn "Use: perl-cleaner --all"
- return 0;
-
- # Reinstall w/ USE Change
- elif ( use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
- ( ! use ithreads && has_version dev-lang/perl[ithreads] ) || \
- ( use debug && ! has_version dev-lang/perl[debug] ) || \
- ( ! use debug && has_version dev-lang/perl[debug] ) ; then
- echo ""
- ewarn "TOGGLED USE-FLAGS WARNING:"
- ewarn "You changed one of the use-flags ithreads or debug."
- ewarn "You must rebuild all perl-modules installed."
- ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
- fi
-}
-
-pkg_setup() {
- case ${CHOST} in
- *-freebsd*) osname="freebsd" ;;
- *-dragonfly*) osname="dragonfly" ;;
- *-netbsd*) osname="netbsd" ;;
- *-openbsd*) osname="openbsd" ;;
- *-darwin*) osname="darwin" ;;
- *-solaris*) osname="solaris" ;;
- *-cygwin*) osname="cygwin" ;;
- *) osname="linux" ;;
- esac
-
- myarch="${CHOST%%-*}-${osname}"
- if use debug ; then
- myarch+="-debug"
- fi
- if use ithreads ; then
- mythreading="-multi"
- myarch+="-thread"
- fi
-
- PRIV_BASE="/usr/$(get_libdir)/perl5"
- SITE_BASE="/usr/local/$(get_libdir)/perl5"
- VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
- LIBPERL="libperl$(get_libname ${MY_PV} )"
- PRIV_LIB="${PRIV_BASE}/${MY_PV}"
- ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
- SITE_LIB="${SITE_BASE}/${MY_PV}"
- SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
- VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
- VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
-
- dual_scripts
-}
-
-src_remove_dual_file() {
- local i pkg ver
- pkg="$1"
- ver="$2"
- shift 2
- case "${EBUILD_PHASE:-none}" in
- postinst|postrm)
- for i in "$@" ; do
- alternatives_auto_makesym "${i}" "${i}-[0-9]*"
- done
- ;;
- setup)
- for i in "$@" ; do
- if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
- has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
- break
- fi
- done
- ;;
- install)
- for i in "$@" ; do
- if ! [[ -f "${ED}"${i} ]] ; then
- ewarn "${i} does not exist!"
- continue
- fi
- mv "${ED}"${i}{,-${ver}-${P}} || die
- done
- ;;
- esac
-}
-
-src_remove_dual_man() {
- local i pkg ver ff
- pkg="$1"
- ver="$2"
- shift 2
- case "${EBUILD_PHASE:-none}" in
- postinst|postrm)
- for i in "$@" ; do
- ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
- ff=${ff##*${i#${i%.[0-9]}}}
- alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
- done
- ;;
- install)
- for i in "$@" ; do
- if ! [[ -f "${ED}"${i} ]] ; then
- ewarn "${i} does not exist!"
- continue
- fi
- mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
- done
- ;;
- esac
-}
-
-src_remove_dual() {
- local i pkg ver
- pkg="$1"
- ver="$2"
- shift 2
- for i in "$@" ; do
- src_remove_dual_file "${pkg}" "${ver}" "/usr/bin/${i}"
- src_remove_dual_man "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
- done
-}
-
-src_prepare_update_patchlevel_h() {
- # Copied and modified from debian:
- # Copyright 2011 Niko Tyni
- # This program is free software; you can redistribute it and/or modify
- # it under the same terms as Perl itself.
- local patchdir="${WORKDIR}/patches"
- local prefix
- local patchoutput="patchlevel-gentoo.h"
-
- [[ -f ${patchdir}/series ]] || return 0
-
-while read patch
-do
- patchname=$(echo $patch | sed 's/\.diff$//')
- < $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e '
-
- # massage the patch headers
- s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend;
- s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend;
- s|^Bug-Gentoo: ||; tprepend;
- s/^\(Subject\|Description\): //; tappend;
- s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend;
-
- # post-process at the end of input
- $ { x;
- # include the version number in the patchlevel.h description (if available)
- s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/;
-
- # escape any backslashes and double quotes
- s|\\|\\\\|g; s|"|\\"|g;
-
- # add a prefix
- s|^|\t,"'"$prefix$patchname"' - |;
- # newlines away
- s/\n/ /g; s/ */ /g;
- # add a suffix
- s/ *$/"/; p
- };
- # stop all processing
- d;
- # label: append to the hold space
- :append H; d;
- # label: prepend to the hold space
- :prepend x; H; d;
- '
-done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}"
-echo "${patchoutput}" >> "${S}/MANIFEST"
-}
-
-src_prepare_perlcross() {
- cp -a ../perl-cross-${CROSS_VER}/* . || die
-
- # bug 604072
- MAKEOPTS+=" -j1"
- export MAKEOPTS
-}
-src_prepare_dynamic() {
- ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
- ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-src_prepare() {
- local patch
- EPATCH_OPTS+=" -p1"
-
- if use hppa ; then
- epatch "${FILESDIR}/${PN}-5.26.2-hppa.patch" # bug 634162
- fi
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # do NOT mess with nsl, on Solaris this is always necessary,
- # when -lsocket is used e.g. to get h_errno
- sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
- fi
-
- einfo "Applying patches from ${PATCH_BASE} ..."
- while read patch ; do
- EPATCH_SINGLE_MSG=" ${patch} ..."
- epatch "${WORKDIR}"/patches/${patch}
- done < "${WORKDIR}"/patches/series
-
- src_prepare_update_patchlevel_h
-
- tc-is-cross-compiler && src_prepare_perlcross
-
- tc-is-static-only || src_prepare_dynamic
-
- if use gdbm; then
- sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
- ext/NDBM_File/Makefile.PL || die
- fi
-
- # Use errno.h from prefix rather than from host system, bug #645804
- if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
- sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
- fi
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # set a soname, fix linking against just built libperl
- sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
- fi
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # fix install_name (soname) not to reference $D
- sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-
- # Upstreamed, but not in this version.
- # Need to recognise macOS 11 / 10.16. #757249
- eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch"
- fi
-
- default
-}
-
-myconf() {
- # the myconf array is declared in src_configure
- myconf=( "${myconf[@]}" "$@" )
-}
-
-src_configure() {
- declare -a myconf
-
- export LC_ALL="C"
- [[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
- # Perl has problems compiling with -Os in your flags with glibc
- use elibc_uclibc || replace-flags "-Os" "-O2"
-
- # xlocale.h is going away in glibc-2.26, so it's counterproductive
- # if we use it and include it in CORE/perl.h ... Perl builds just
- # fine with glibc and locale.h only.
- # However, the darwin prefix people have no locale.h ...
- use elibc_glibc && myconf -Ui_xlocale
-
- # This flag makes compiling crash in interesting ways
- filter-flags "-malign-double"
-
- # Generic LTO broken since 5.28, triggers EUMM failures
- filter-flags "-flto"
-
- use sparc && myconf -Ud_longdbl
-
- export BUILD_BZIP2=0
- export BZIP2_INCLUDE=${EROOT}/usr/include
- export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
- export BUILD_ZLIB=False
- export ZLIB_INCLUDE=${EROOT}/usr/include
- export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
- # allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
- myndbm='U'
- mygdbm='U'
- mydb='U'
- if use gdbm ; then
- mygdbm='D'
- if use berkdb ; then
- myndbm='D'
- fi
- fi
- if use berkdb ; then
- mydb='D'
- has_version '=sys-libs/db-1*' && myndbm='D'
- fi
-
- myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
- if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
- ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
- myconf -Ui_db -Ui_ndbm
- fi
-
- use ithreads && myconf -Dusethreads
-
- if use debug ; then
- append-cflags "-g"
- myconf -DDEBUGGING
- elif [[ ${CFLAGS} == *-g* ]] ; then
- myconf -DDEBUGGING=-g
- else
- myconf -DDEBUGGING=none
- fi
-
- # Autodiscover all old version directories, some of them will even be newer
- # if you downgrade
- if [[ -z ${PERL_OLDVERSEN} ]]; then
- PERL_OLDVERSEN="$(
- find "${EROOT%/}${PRIV_BASE}" "${EROOT%/}${SITE_BASE}" "${EROOT%/}${VENDOR_BASE}" \
- -maxdepth 1 -mindepth 1 -type d -regex '.*/5[.][0-9]+[.][0-9]+$' \
- -printf "%f " 2>/dev/null )"
- fi
- # Fixup versions, removing self match, fixing order and dupes
- PERL_OLDVERSEN="$(
- echo "${PERL_OLDVERSEN}" |\
- tr " " "\n" |\
- grep -vF "${DIST_VERSION%-RC}" |\
- sort -u -nr -t'.' -k1,1 -k2,2 -k3,3
- )"
-
- # Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
- if [[ -n "${PERL_OLDVERSEN// }" ]]; then
- local inclist="$(
- for v in ${PERL_OLDVERSEN}; do
- has "${v}" ${PERL_BIN_OLDVERSEN} && echo -n "${v}/${myarch}${mythreading} ";
- echo -n "${v} ";
- done )"
- einfo "This version of perl may partially support modules previously"
- einfo "installed in any of the following paths:"
- for incpath in ${inclist}; do
- [[ -e "${EROOT%/}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT%/}${VENDOR_BASE}/${incpath}"
- [[ -e "${EROOT%/}${PRIV_BASE}/${incpath}" ]] && einfo " ${EROO%/T}${PRIV_BASE}/${incpath}"
- [[ -e "${EROOT%/}${SITE_BASE}/${incpath}" ]] && einfo " ${EROOT%/}${SITE_BASE}/${incpath}"
- done
- einfo "This is a temporary measure and you should aim to cleanup these paths"
- einfo "via world updates and perl-cleaner"
- myconf -Dinc_version_list="${inclist}"
- fi
-
- [[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
- # Make sure we can do the final link #523730, need to set deployment
- # target to override hardcoded 10.3 which breaks on modern OSX
- [[ ${CHOST} == *-darwin* ]] && \
- myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
- # Older macOS with non-Apple GCC chokes on inline in system headers
- # using c89 mode as injected by cflags.SH
- [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
- append-cflags -Dinline=__inline__
-
- # fix unaligned access misdetection
- # https://rt.perl.org/Public/Bug/Display.html?id=133495
- # https://rt.perl.org/Public/Bug/Display.html?id=133803
- # bug #676062, bug #688432
- use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] || \
- [[ ${CHOST} == armv5tel* ]] \
- && myconf "-Dd_u32align='define'"
-
- # Prefix: the host system needs not to follow Gentoo multilib stuff, and in
- # Prefix itself we don't do multilib either, so make sure perl can find
- # something compatible.
- if use prefix ; then
- # Set a hook to check for each detected library whether it actually works.
- export libscheck="
- ( echo 'main(){}' > '${T}'/conftest.c &&
- $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
- ) || xxx=/dev/null"
-
- # Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
- local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
- myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
- elif [[ $(get_libdir) != "lib" ]] ; then
- # We need to use " and not ', as the written config.sh use ' ...
- myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
- fi
-
- # don't try building ODBM, bug #354453
- disabled_extensions="ODBM_File"
-
- if ! use gdbm ; then
- # workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
- disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
- fi
-
- myconf -Dnoextensions="${disabled_extensions}"
-
- [[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
- [[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
- # allow fiddling via EXTRA_ECONF, bug 558070
- eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
- # setting -Dld= to tc-getLD breaks perl and all perl things
- # https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
- myconf \
- -Duseshrplib \
- -Darchname="${myarch}" \
- -Dcc="$(tc-getCC)" \
- -Dar="$(tc-getAR)" \
- -Dnm="$(tc-getNM)" \
- -Dcpp="$(tc-getCPP)" \
- -Dranlib="$(tc-getRANLIB)" \
- -Doptimize="${CFLAGS}" \
- -Dldflags="${LDFLAGS}" \
- -Dprefix="${EPREFIX}"'/usr' \
- -Dsiteprefix="${EPREFIX}"'/usr/local' \
- -Dvendorprefix="${EPREFIX}"'/usr' \
- -Dscriptdir="${EPREFIX}"'/usr/bin' \
- -Dprivlib="${EPREFIX}${PRIV_LIB}" \
- -Darchlib="${EPREFIX}${ARCH_LIB}" \
- -Dsitelib="${EPREFIX}${SITE_LIB}" \
- -Dsitearch="${EPREFIX}${SITE_ARCH}" \
- -Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
- -Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
- -Dman1dir="${EPREFIX}"/usr/share/man/man1 \
- -Dman3dir="${EPREFIX}"/usr/share/man/man3 \
- -Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
- -Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
- -Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
- -Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
- -Dman1ext='1' \
- -Dman3ext='3pm' \
- -Dlibperl="${LIBPERL}" \
- -Dlocincpth="${EPREFIX}"'/usr/include ' \
- -Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
- -Duselargefiles \
- -Dd_semctl_semun \
- -Dcf_by='Gentoo' \
- -Dmyhostname='localhost' \
- -Dperladmin='root@localhost' \
- -Ud_csh \
- -Dsh="${EPREFIX}"/bin/sh \
- -Dtargetsh="${EPREFIX}"/bin/sh \
- -Uusenm \
- "${myconf[@]}" \
- "${EXTRA_ECONF[@]}"
-
- if tc-is-cross-compiler; then
- ./configure \
- --target="${CHOST}" \
- --build="${CBUILD}" \
- -Dinstallprefix='' \
- -Dinstallusrbinperl='undef' \
- -Dusevendorprefix='define' \
- "${myconf[@]}" \
- || die "Unable to configure"
- else
- sh Configure \
- -des \
- -Dinstallprefix="${EPREFIX}"'/usr' \
- -Dinstallusrbinperl='n' \
- "${myconf[@]}" \
- || die "Unable to configure"
- fi
-}
-
-src_test() {
- export NO_GENTOO_NETWORK_TESTS=1;
- export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
- export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
- if [[ ${EUID} == 0 ]] ; then
- ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
- return 0
- fi
- use elibc_uclibc && export MAKEOPTS+=" -j1"
- TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
- local i
- local coredir="${ARCH_LIB}/CORE"
-
- emake DESTDIR="${D}" install
-
- rm -f "${ED}/usr/bin/perl${MY_PV}"
- ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
- if ! tc-is-static-only ; then
- dolib.so "${ED}"${coredir}/${LIBPERL}
- rm -f "${ED}"${coredir}/${LIBPERL}
- ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
- ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
- ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
- ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
- ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
- fi
-
- rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
- # This removes ${D} from Config.pm
- for i in $(find "${D}" -iname "Config.pm" ) ; do
- einfo "Removing ${D} from ${i}..."
- sed -i -e "s:${D}::" "${i}" || die "Sed failed"
- done
-
- dodoc Changes* README AUTHORS
-
- if use doc ; then
- # HTML Documentation
- # We expect errors, warnings, and such with the following.
-
- dodir /usr/share/doc/${PF}/html
- LD_LIBRARY_PATH=. ./perl installhtml \
- --podroot='.' \
- --podpath='lib:ext:pod:vms' \
- --recurse \
- --htmldir="${ED}/usr/share/doc/${PF}/html"
- fi
-
- [[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
- dual_scripts
-}
-
-pkg_preinst() {
- check_rebuild
-}
-
-pkg_postinst() {
- dual_scripts
-
- if [[ "${ROOT}" = "/" ]] ; then
- local INC DIR file
- INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
- einfo "Removing old .ph files"
- for DIR in ${INC} ; do
- if [[ -d "${DIR}" ]] ; then
- for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
- rm -f "${file}"
- einfo "<< ${file}"
- done
- fi
- done
- # Silently remove the now empty dirs
- for DIR in ${INC} ; do
- if [[ -d "${DIR}" ]] ; then
- find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
- fi
- done
-
- fi
-}
-
-pkg_postrm() {
- dual_scripts
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-26 13:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-26 13:41 [gentoo-commits] repo/proj/prefix:master commit in: dev-lang/perl/files/, dev-lang/perl/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2020-12-11 20:28 Sam James
2020-11-27 18:33 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox