Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/files/
Date: Thu, 26 Aug 2021 22:32:48
Message-Id: 1630017151.879530c9d5c8958c94b3cc19184dc920971337fb.sam@gentoo
1 commit: 879530c9d5c8958c94b3cc19184dc920971337fb
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Wed Aug 25 14:36:55 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 26 22:32:31 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=879530c9
7
8 dev-lang/perl: remove unused patch
9
10 Package-Manager: Portage-3.0.22, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 .../perl/files/perl-5.30.3-darwin-macos11.patch | 180 ---------------------
15 1 file changed, 180 deletions(-)
16
17 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
18 deleted file mode 100644
19 index 73879b398c4..00000000000
20 --- a/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
21 +++ /dev/null
22 @@ -1,180 +0,0 @@
23 -https://github.com/Perl/perl5/pull/17946
24 -https://bugs.gentoo.org/757249
25 ----
26 -From b382aafc793fe1007f9058a5145a1d39d56cef70 Mon Sep 17 00:00:00 2001
27 -From: Adam Hartley <git@××××××××.com>
28 -Date: Mon, 6 Jul 2020 22:59:42 +0100
29 -Subject: [PATCH 1/7] Add 11.x support for darwin.sh
30 -
31 ----
32 - hints/darwin.sh | 4 ++--
33 - 1 file changed, 2 insertions(+), 2 deletions(-)
34 -
35 -diff --git a/hints/darwin.sh b/hints/darwin.sh
36 -index 0a91bc083c0..c0f06de1cab 100644
37 ---- a/hints/darwin.sh
38 -+++ b/hints/darwin.sh
39 -@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
40 - # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
41 - # capturing its value and adding it to the flags.
42 - case "$MACOSX_DEPLOYMENT_TARGET" in
43 -- 10.*)
44 -+ 10.* | 11.*)
45 - add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
46 - add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
47 - ;;
48 -@@ -327,7 +327,7 @@ EOM
49 - # "ProductVersion: 10.11" "10.11"
50 - prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
51 - case "$prodvers" in
52 -- 10.*)
53 -+ 10.* | 11.*)
54 - add_macosx_version_min ccflags $prodvers
55 - add_macosx_version_min ldflags $prodvers
56 - ;;
57 -
58 -From 960d1a5c4225d1dd12636a469e10a568464e4e7c Mon Sep 17 00:00:00 2001
59 -From: Adam Hartley <git@××××××××.com>
60 -Date: Wed, 8 Jul 2020 19:10:33 +0100
61 -Subject: [PATCH 3/7] Update error message
62 -
63 ----
64 - hints/darwin.sh | 2 +-
65 - 1 file changed, 1 insertion(+), 1 deletion(-)
66 -
67 -diff --git a/hints/darwin.sh b/hints/darwin.sh
68 -index c0f06de1cab..988b766c4f4 100644
69 ---- a/hints/darwin.sh
70 -+++ b/hints/darwin.sh
71 -@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
72 -
73 - *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
74 - ***
75 --*** Please either set it to 10.something, or to empty.
76 -+*** Please either set it to 10.something, 11.something or to empty.
77 -
78 - EOM
79 - exit 1
80 -
81 -From d633cced1d5174e19c5f2234a9fb4c7603cfb9db Mon Sep 17 00:00:00 2001
82 -From: Adam Hartley <git@××××××××.com>
83 -Date: Sat, 11 Jul 2020 11:41:27 +0100
84 -Subject: [PATCH 4/7] Update deprecated syscall check for 11.x and greater
85 -
86 ----
87 - hints/darwin.sh | 4 ++--
88 - 1 file changed, 2 insertions(+), 2 deletions(-)
89 -
90 -diff --git a/hints/darwin.sh b/hints/darwin.sh
91 -index 988b766c4f4..4f73a9995e7 100644
92 ---- a/hints/darwin.sh
93 -+++ b/hints/darwin.sh
94 -@@ -342,11 +342,11 @@ EOM
95 - exit 1
96 - esac
97 -
98 -- # The X in 10.X
99 -+ prodvers_major=$(echo $prodvers|awk -F. '{print $1}')
100 - prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
101 -
102 - # macOS (10.12) deprecated syscall().
103 -- if [ "$prodvers_minor" -ge 12 ]; then
104 -+ if [[ ( "$prodvers_minor" -ge 12 && "$prodvers_major" -eq 10 ) || "$prodvers_major" -ge 11 ]]; then
105 - d_syscall='undef'
106 - # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
107 - case "$MACOSX_DEPLOYMENT_TARGET" in
108 -
109 -From 9c3890f8521a7db6d9b2aa21561c7d0dae9fb91d Mon Sep 17 00:00:00 2001
110 -From: Adam Hartley <BytesGuy@××××××××××××××××××××.com>
111 -Date: Wed, 22 Jul 2020 13:15:30 +0100
112 -Subject: [PATCH 5/7] Simplify syscall check
113 -
114 ----
115 - hints/darwin.sh | 7 +++----
116 - 1 file changed, 3 insertions(+), 4 deletions(-)
117 -
118 -diff --git a/hints/darwin.sh b/hints/darwin.sh
119 -index 4f73a9995e7..40c84cf267a 100644
120 ---- a/hints/darwin.sh
121 -+++ b/hints/darwin.sh
122 -@@ -342,11 +342,10 @@ EOM
123 - exit 1
124 - esac
125 -
126 -- prodvers_major=$(echo $prodvers|awk -F. '{print $1}')
127 -- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
128 -+ darwin_major=$(echo $osvers|awk -F. '{print $1}')
129 -
130 -- # macOS (10.12) deprecated syscall().
131 -- if [[ ( "$prodvers_minor" -ge 12 && "$prodvers_major" -eq 10 ) || "$prodvers_major" -ge 11 ]]; then
132 -+ # macOS 10.12 (darwin 6.0.0) deprecated syscall().
133 -+ if [ "$darwin_major" -ge 6 ]; then
134 - d_syscall='undef'
135 - # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
136 - case "$MACOSX_DEPLOYMENT_TARGET" in
137 -
138 -From 99ff8934992102a3db63805e8ba9710577de164e Mon Sep 17 00:00:00 2001
139 -From: Adam Hartley <BytesGuy@××××××××××××××××××××.com>
140 -Date: Wed, 22 Jul 2020 13:15:53 +0100
141 -Subject: [PATCH 6/7] Update darwin.sh
142 -
143 ----
144 - hints/darwin.sh | 4 ++--
145 - 1 file changed, 2 insertions(+), 2 deletions(-)
146 -
147 -diff --git a/hints/darwin.sh b/hints/darwin.sh
148 -index 40c84cf267a..1709d224f7c 100644
149 ---- a/hints/darwin.sh
150 -+++ b/hints/darwin.sh
151 -@@ -344,8 +344,8 @@ EOM
152 -
153 - darwin_major=$(echo $osvers|awk -F. '{print $1}')
154 -
155 -- # macOS 10.12 (darwin 6.0.0) deprecated syscall().
156 -- if [ "$darwin_major" -ge 6 ]; then
157 -+ # macOS 10.12 (darwin 16.0.0) deprecated syscall().
158 -+ if [ "$darwin_major" -ge 16 ]; then
159 - d_syscall='undef'
160 - # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
161 - case "$MACOSX_DEPLOYMENT_TARGET" in
162 -
163 -From 1b712e4b359d9508461a0a832d06baa6e589b955 Mon Sep 17 00:00:00 2001
164 -From: Adam Hartley <BytesGuy@××××××××××××××××××××.com>
165 -Date: Thu, 23 Jul 2020 19:53:07 +0100
166 -Subject: [PATCH 7/7] Future proof version check
167 -
168 ----
169 - hints/darwin.sh | 6 +++---
170 - 1 file changed, 3 insertions(+), 3 deletions(-)
171 -
172 -diff --git a/hints/darwin.sh b/hints/darwin.sh
173 -index 1709d224f7c..fdfbdd4a3b9 100644
174 ---- a/hints/darwin.sh
175 -+++ b/hints/darwin.sh
176 -@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
177 - # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
178 - # capturing its value and adding it to the flags.
179 - case "$MACOSX_DEPLOYMENT_TARGET" in
180 -- 10.* | 11.*)
181 -+ [1-9][0-9].*)
182 - add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
183 - add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
184 - ;;
185 -@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
186 -
187 - *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
188 - ***
189 --*** Please either set it to 10.something, 11.something or to empty.
190 -+*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
191 -
192 - EOM
193 - exit 1
194 -@@ -327,7 +327,7 @@ EOM
195 - # "ProductVersion: 10.11" "10.11"
196 - prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
197 - case "$prodvers" in
198 -- 10.* | 11.*)
199 -+ [1-9][0-9].*)
200 - add_macosx_version_min ccflags $prodvers
201 - add_macosx_version_min ldflags $prodvers
202 - ;;