1 |
commit: 9bf33e97778f172a46b6f0ab5793fb9ae573aea5 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 26 13:35:04 2020 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 26 13:35:04 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf33e97 |
7 |
|
8 |
dev-lang/perl: add missing darwin 20 patch, #757249 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/757249 |
11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
13 |
|
14 |
.../perl/files/perl-5.30.3-darwin-macos11.patch | 180 +++++++++++++++++++++ |
15 |
dev-lang/perl/perl-5.30.3-r1.ebuild | 4 + |
16 |
dev-lang/perl/perl-5.30.3-r2.ebuild | 4 + |
17 |
dev-lang/perl/perl-5.32.0-r1.ebuild | 4 + |
18 |
dev-lang/perl/perl-5.32.0.ebuild | 4 + |
19 |
5 files changed, 196 insertions(+) |
20 |
|
21 |
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 |
22 |
new file mode 100644 |
23 |
index 00000000000..73879b398c4 |
24 |
--- /dev/null |
25 |
+++ b/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch |
26 |
@@ -0,0 +1,180 @@ |
27 |
+https://github.com/Perl/perl5/pull/17946 |
28 |
+https://bugs.gentoo.org/757249 |
29 |
+--- |
30 |
+From b382aafc793fe1007f9058a5145a1d39d56cef70 Mon Sep 17 00:00:00 2001 |
31 |
+From: Adam Hartley <git@××××××××.com> |
32 |
+Date: Mon, 6 Jul 2020 22:59:42 +0100 |
33 |
+Subject: [PATCH 1/7] Add 11.x support for darwin.sh |
34 |
+ |
35 |
+--- |
36 |
+ hints/darwin.sh | 4 ++-- |
37 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
38 |
+ |
39 |
+diff --git a/hints/darwin.sh b/hints/darwin.sh |
40 |
+index 0a91bc083c0..c0f06de1cab 100644 |
41 |
+--- a/hints/darwin.sh |
42 |
++++ b/hints/darwin.sh |
43 |
+@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x |
44 |
+ # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by |
45 |
+ # capturing its value and adding it to the flags. |
46 |
+ case "$MACOSX_DEPLOYMENT_TARGET" in |
47 |
+- 10.*) |
48 |
++ 10.* | 11.*) |
49 |
+ add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET |
50 |
+ add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET |
51 |
+ ;; |
52 |
+@@ -327,7 +327,7 @@ EOM |
53 |
+ # "ProductVersion: 10.11" "10.11" |
54 |
+ prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'` |
55 |
+ case "$prodvers" in |
56 |
+- 10.*) |
57 |
++ 10.* | 11.*) |
58 |
+ add_macosx_version_min ccflags $prodvers |
59 |
+ add_macosx_version_min ldflags $prodvers |
60 |
+ ;; |
61 |
+ |
62 |
+From 960d1a5c4225d1dd12636a469e10a568464e4e7c Mon Sep 17 00:00:00 2001 |
63 |
+From: Adam Hartley <git@××××××××.com> |
64 |
+Date: Wed, 8 Jul 2020 19:10:33 +0100 |
65 |
+Subject: [PATCH 3/7] Update error message |
66 |
+ |
67 |
+--- |
68 |
+ hints/darwin.sh | 2 +- |
69 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
70 |
+ |
71 |
+diff --git a/hints/darwin.sh b/hints/darwin.sh |
72 |
+index c0f06de1cab..988b766c4f4 100644 |
73 |
+--- a/hints/darwin.sh |
74 |
++++ b/hints/darwin.sh |
75 |
+@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x |
76 |
+ |
77 |
+ *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET |
78 |
+ *** |
79 |
+-*** Please either set it to 10.something, or to empty. |
80 |
++*** Please either set it to 10.something, 11.something or to empty. |
81 |
+ |
82 |
+ EOM |
83 |
+ exit 1 |
84 |
+ |
85 |
+From d633cced1d5174e19c5f2234a9fb4c7603cfb9db Mon Sep 17 00:00:00 2001 |
86 |
+From: Adam Hartley <git@××××××××.com> |
87 |
+Date: Sat, 11 Jul 2020 11:41:27 +0100 |
88 |
+Subject: [PATCH 4/7] Update deprecated syscall check for 11.x and greater |
89 |
+ |
90 |
+--- |
91 |
+ hints/darwin.sh | 4 ++-- |
92 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
93 |
+ |
94 |
+diff --git a/hints/darwin.sh b/hints/darwin.sh |
95 |
+index 988b766c4f4..4f73a9995e7 100644 |
96 |
+--- a/hints/darwin.sh |
97 |
++++ b/hints/darwin.sh |
98 |
+@@ -342,11 +342,11 @@ EOM |
99 |
+ exit 1 |
100 |
+ esac |
101 |
+ |
102 |
+- # The X in 10.X |
103 |
++ prodvers_major=$(echo $prodvers|awk -F. '{print $1}') |
104 |
+ prodvers_minor=$(echo $prodvers|awk -F. '{print $2}') |
105 |
+ |
106 |
+ # macOS (10.12) deprecated syscall(). |
107 |
+- if [ "$prodvers_minor" -ge 12 ]; then |
108 |
++ if [[ ( "$prodvers_minor" -ge 12 && "$prodvers_major" -eq 10 ) || "$prodvers_major" -ge 11 ]]; then |
109 |
+ d_syscall='undef' |
110 |
+ # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime() |
111 |
+ case "$MACOSX_DEPLOYMENT_TARGET" in |
112 |
+ |
113 |
+From 9c3890f8521a7db6d9b2aa21561c7d0dae9fb91d Mon Sep 17 00:00:00 2001 |
114 |
+From: Adam Hartley <BytesGuy@××××××××××××××××××××.com> |
115 |
+Date: Wed, 22 Jul 2020 13:15:30 +0100 |
116 |
+Subject: [PATCH 5/7] Simplify syscall check |
117 |
+ |
118 |
+--- |
119 |
+ hints/darwin.sh | 7 +++---- |
120 |
+ 1 file changed, 3 insertions(+), 4 deletions(-) |
121 |
+ |
122 |
+diff --git a/hints/darwin.sh b/hints/darwin.sh |
123 |
+index 4f73a9995e7..40c84cf267a 100644 |
124 |
+--- a/hints/darwin.sh |
125 |
++++ b/hints/darwin.sh |
126 |
+@@ -342,11 +342,10 @@ EOM |
127 |
+ exit 1 |
128 |
+ esac |
129 |
+ |
130 |
+- prodvers_major=$(echo $prodvers|awk -F. '{print $1}') |
131 |
+- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}') |
132 |
++ darwin_major=$(echo $osvers|awk -F. '{print $1}') |
133 |
+ |
134 |
+- # macOS (10.12) deprecated syscall(). |
135 |
+- if [[ ( "$prodvers_minor" -ge 12 && "$prodvers_major" -eq 10 ) || "$prodvers_major" -ge 11 ]]; then |
136 |
++ # macOS 10.12 (darwin 6.0.0) deprecated syscall(). |
137 |
++ if [ "$darwin_major" -ge 6 ]; then |
138 |
+ d_syscall='undef' |
139 |
+ # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime() |
140 |
+ case "$MACOSX_DEPLOYMENT_TARGET" in |
141 |
+ |
142 |
+From 99ff8934992102a3db63805e8ba9710577de164e Mon Sep 17 00:00:00 2001 |
143 |
+From: Adam Hartley <BytesGuy@××××××××××××××××××××.com> |
144 |
+Date: Wed, 22 Jul 2020 13:15:53 +0100 |
145 |
+Subject: [PATCH 6/7] Update darwin.sh |
146 |
+ |
147 |
+--- |
148 |
+ hints/darwin.sh | 4 ++-- |
149 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
150 |
+ |
151 |
+diff --git a/hints/darwin.sh b/hints/darwin.sh |
152 |
+index 40c84cf267a..1709d224f7c 100644 |
153 |
+--- a/hints/darwin.sh |
154 |
++++ b/hints/darwin.sh |
155 |
+@@ -344,8 +344,8 @@ EOM |
156 |
+ |
157 |
+ darwin_major=$(echo $osvers|awk -F. '{print $1}') |
158 |
+ |
159 |
+- # macOS 10.12 (darwin 6.0.0) deprecated syscall(). |
160 |
+- if [ "$darwin_major" -ge 6 ]; then |
161 |
++ # macOS 10.12 (darwin 16.0.0) deprecated syscall(). |
162 |
++ if [ "$darwin_major" -ge 16 ]; then |
163 |
+ d_syscall='undef' |
164 |
+ # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime() |
165 |
+ case "$MACOSX_DEPLOYMENT_TARGET" in |
166 |
+ |
167 |
+From 1b712e4b359d9508461a0a832d06baa6e589b955 Mon Sep 17 00:00:00 2001 |
168 |
+From: Adam Hartley <BytesGuy@××××××××××××××××××××.com> |
169 |
+Date: Thu, 23 Jul 2020 19:53:07 +0100 |
170 |
+Subject: [PATCH 7/7] Future proof version check |
171 |
+ |
172 |
+--- |
173 |
+ hints/darwin.sh | 6 +++--- |
174 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
175 |
+ |
176 |
+diff --git a/hints/darwin.sh b/hints/darwin.sh |
177 |
+index 1709d224f7c..fdfbdd4a3b9 100644 |
178 |
+--- a/hints/darwin.sh |
179 |
++++ b/hints/darwin.sh |
180 |
+@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x |
181 |
+ # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by |
182 |
+ # capturing its value and adding it to the flags. |
183 |
+ case "$MACOSX_DEPLOYMENT_TARGET" in |
184 |
+- 10.* | 11.*) |
185 |
++ [1-9][0-9].*) |
186 |
+ add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET |
187 |
+ add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET |
188 |
+ ;; |
189 |
+@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x |
190 |
+ |
191 |
+ *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET |
192 |
+ *** |
193 |
+-*** Please either set it to 10.something, 11.something or to empty. |
194 |
++*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty. |
195 |
+ |
196 |
+ EOM |
197 |
+ exit 1 |
198 |
+@@ -327,7 +327,7 @@ EOM |
199 |
+ # "ProductVersion: 10.11" "10.11" |
200 |
+ prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'` |
201 |
+ case "$prodvers" in |
202 |
+- 10.* | 11.*) |
203 |
++ [1-9][0-9].*) |
204 |
+ add_macosx_version_min ccflags $prodvers |
205 |
+ add_macosx_version_min ldflags $prodvers |
206 |
+ ;; |
207 |
|
208 |
diff --git a/dev-lang/perl/perl-5.30.3-r1.ebuild b/dev-lang/perl/perl-5.30.3-r1.ebuild |
209 |
index e75625597fc..585fc613bd6 100644 |
210 |
--- a/dev-lang/perl/perl-5.30.3-r1.ebuild |
211 |
+++ b/dev-lang/perl/perl-5.30.3-r1.ebuild |
212 |
@@ -342,6 +342,10 @@ src_prepare() { |
213 |
if [[ ${CHOST} == *-darwin* ]] ; then |
214 |
# fix install_name (soname) not to reference $D |
215 |
sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die |
216 |
+ |
217 |
+ # Upstreamed, but not in this version. |
218 |
+ # Need to recognise macOS 11 / 10.16. #757249 |
219 |
+ eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch" |
220 |
fi |
221 |
|
222 |
default |
223 |
|
224 |
diff --git a/dev-lang/perl/perl-5.30.3-r2.ebuild b/dev-lang/perl/perl-5.30.3-r2.ebuild |
225 |
index 0ad5fc03413..019eaaadd99 100644 |
226 |
--- a/dev-lang/perl/perl-5.30.3-r2.ebuild |
227 |
+++ b/dev-lang/perl/perl-5.30.3-r2.ebuild |
228 |
@@ -424,6 +424,10 @@ src_prepare() { |
229 |
if [[ ${CHOST} == *-darwin* ]] ; then |
230 |
# fix install_name (soname) not to reference $D |
231 |
sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die |
232 |
+ |
233 |
+ # Upstreamed, but not in this version. |
234 |
+ # Need to recognise macOS 11 / 10.16. #757249 |
235 |
+ eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch" |
236 |
fi |
237 |
|
238 |
default |
239 |
|
240 |
diff --git a/dev-lang/perl/perl-5.32.0-r1.ebuild b/dev-lang/perl/perl-5.32.0-r1.ebuild |
241 |
index 0791da1fc3b..581b577c6cc 100644 |
242 |
--- a/dev-lang/perl/perl-5.32.0-r1.ebuild |
243 |
+++ b/dev-lang/perl/perl-5.32.0-r1.ebuild |
244 |
@@ -427,6 +427,10 @@ src_prepare() { |
245 |
if [[ ${CHOST} == *-darwin* ]] ; then |
246 |
# fix install_name (soname) not to reference $D |
247 |
sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die |
248 |
+ |
249 |
+ # Upstreamed, but not in this version. |
250 |
+ # Need to recognise macOS 11 / 10.16. #757249 |
251 |
+ eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch" |
252 |
fi |
253 |
|
254 |
default |
255 |
|
256 |
diff --git a/dev-lang/perl/perl-5.32.0.ebuild b/dev-lang/perl/perl-5.32.0.ebuild |
257 |
index 86be1e04a1c..953b8a65caf 100644 |
258 |
--- a/dev-lang/perl/perl-5.32.0.ebuild |
259 |
+++ b/dev-lang/perl/perl-5.32.0.ebuild |
260 |
@@ -343,6 +343,10 @@ src_prepare() { |
261 |
if [[ ${CHOST} == *-darwin* ]] ; then |
262 |
# fix install_name (soname) not to reference $D |
263 |
sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die |
264 |
+ |
265 |
+ # Upstreamed, but not in this version. |
266 |
+ # Need to recognise macOS 11 / 10.16. #757249 |
267 |
+ eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch" |
268 |
fi |
269 |
|
270 |
default |