1 |
commit: 564d68aa779719c613994f6b933cbb3f31e00d3a |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 26 12:44:38 2020 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 26 12:45:44 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564d68aa |
7 |
|
8 |
dev-lang/perl: fix flock on sparc-solaris |
9 |
|
10 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
12 |
|
13 |
dev-lang/perl/perl-5.30.3-r1.ebuild | 6 +++++- |
14 |
dev-lang/perl/perl-5.30.3-r2.ebuild | 6 +++++- |
15 |
dev-lang/perl/perl-5.32.0-r1.ebuild | 6 +++++- |
16 |
dev-lang/perl/perl-5.32.0.ebuild | 6 +++++- |
17 |
4 files changed, 20 insertions(+), 4 deletions(-) |
18 |
|
19 |
diff --git a/dev-lang/perl/perl-5.30.3-r1.ebuild b/dev-lang/perl/perl-5.30.3-r1.ebuild |
20 |
index b437e661e57..e75625597fc 100644 |
21 |
--- a/dev-lang/perl/perl-5.30.3-r1.ebuild |
22 |
+++ b/dev-lang/perl/perl-5.30.3-r1.ebuild |
23 |
@@ -463,6 +463,10 @@ src_configure() { |
24 |
[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ |
25 |
append-cflags -Dinline=__inline__ |
26 |
|
27 |
+ # flock on 32-bit sparc Solaris is broken, fall back to fcntl |
28 |
+ [[ ${CHOST} == sparc-*-solaris* ]] && \ |
29 |
+ myconf -Ud_flock |
30 |
+ |
31 |
# fix unaligned access misdetection |
32 |
# https://rt.perl.org/Public/Bug/Display.html?id=133495 |
33 |
# https://rt.perl.org/Public/Bug/Display.html?id=133803 |
34 |
@@ -478,7 +482,7 @@ src_configure() { |
35 |
# Set a hook to check for each detected library whether it actually works. |
36 |
export libscheck=" |
37 |
( echo 'main(){}' > '${T}'/conftest.c && |
38 |
- $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null |
39 |
+ $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null |
40 |
) || xxx=/dev/null" |
41 |
|
42 |
# Use all host paths that might contain useful stuff, the hook above will filter out bad choices. |
43 |
|
44 |
diff --git a/dev-lang/perl/perl-5.30.3-r2.ebuild b/dev-lang/perl/perl-5.30.3-r2.ebuild |
45 |
index 6e6c7bf0efc..0ad5fc03413 100644 |
46 |
--- a/dev-lang/perl/perl-5.30.3-r2.ebuild |
47 |
+++ b/dev-lang/perl/perl-5.30.3-r2.ebuild |
48 |
@@ -619,6 +619,10 @@ src_configure() { |
49 |
[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ |
50 |
append-cflags -Dinline=__inline__ |
51 |
|
52 |
+ # flock on 32-bit sparc Solaris is broken, fall back to fcntl |
53 |
+ [[ ${CHOST} == sparc-*-solaris* ]] && \ |
54 |
+ myconf -Ud_flock |
55 |
+ |
56 |
# fix unaligned access misdetection |
57 |
# https://rt.perl.org/Public/Bug/Display.html?id=133495 |
58 |
# https://rt.perl.org/Public/Bug/Display.html?id=133803 |
59 |
@@ -634,7 +638,7 @@ src_configure() { |
60 |
# Set a hook to check for each detected library whether it actually works. |
61 |
export libscheck=" |
62 |
( echo 'main(){}' > '${T}'/conftest.c && |
63 |
- $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null |
64 |
+ $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null |
65 |
) || xxx=/dev/null" |
66 |
|
67 |
# Use all host paths that might contain useful stuff, the hook above will filter out bad choices. |
68 |
|
69 |
diff --git a/dev-lang/perl/perl-5.32.0-r1.ebuild b/dev-lang/perl/perl-5.32.0-r1.ebuild |
70 |
index 0c5fdc0e83d..0791da1fc3b 100644 |
71 |
--- a/dev-lang/perl/perl-5.32.0-r1.ebuild |
72 |
+++ b/dev-lang/perl/perl-5.32.0-r1.ebuild |
73 |
@@ -622,6 +622,10 @@ src_configure() { |
74 |
[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ |
75 |
append-cflags -Dinline=__inline__ |
76 |
|
77 |
+ # flock on 32-bit sparc Solaris is broken, fall back to fcntl |
78 |
+ [[ ${CHOST} == sparc-*-solaris* ]] && \ |
79 |
+ myconf -Ud_flock |
80 |
+ |
81 |
# Prefix: the host system needs not to follow Gentoo multilib stuff, and in |
82 |
# Prefix itself we don't do multilib either, so make sure perl can find |
83 |
# something compatible. |
84 |
@@ -629,7 +633,7 @@ src_configure() { |
85 |
# Set a hook to check for each detected library whether it actually works. |
86 |
export libscheck=" |
87 |
( echo 'main(){}' > '${T}'/conftest.c && |
88 |
- $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null |
89 |
+ $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null |
90 |
) || xxx=/dev/null" |
91 |
|
92 |
# Use all host paths that might contain useful stuff, the hook above will filter out bad choices. |
93 |
|
94 |
diff --git a/dev-lang/perl/perl-5.32.0.ebuild b/dev-lang/perl/perl-5.32.0.ebuild |
95 |
index b375dbc322b..86be1e04a1c 100644 |
96 |
--- a/dev-lang/perl/perl-5.32.0.ebuild |
97 |
+++ b/dev-lang/perl/perl-5.32.0.ebuild |
98 |
@@ -464,6 +464,10 @@ src_configure() { |
99 |
[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ |
100 |
append-cflags -Dinline=__inline__ |
101 |
|
102 |
+ # flock on 32-bit sparc Solaris is broken, fall back to fcntl |
103 |
+ [[ ${CHOST} == sparc-*-solaris* ]] && \ |
104 |
+ myconf -Ud_flock |
105 |
+ |
106 |
# Prefix: the host system needs not to follow Gentoo multilib stuff, and in |
107 |
# Prefix itself we don't do multilib either, so make sure perl can find |
108 |
# something compatible. |
109 |
@@ -471,7 +475,7 @@ src_configure() { |
110 |
# Set a hook to check for each detected library whether it actually works. |
111 |
export libscheck=" |
112 |
( echo 'main(){}' > '${T}'/conftest.c && |
113 |
- $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null |
114 |
+ $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null |
115 |
) || xxx=/dev/null" |
116 |
|
117 |
# Use all host paths that might contain useful stuff, the hook above will filter out bad choices. |