1 |
commit: 9629083d7b4571de1d17548e90854346a277dcd4 |
2 |
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> |
3 |
AuthorDate: Mon Nov 25 07:27:20 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 1 23:24:17 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9629083d |
7 |
|
8 |
app-shells/mksh: USE=static now uses the system libc |
9 |
|
10 |
Which means that glibc needs to be masked as it's static-linking is |
11 |
broken. |
12 |
|
13 |
I considered dietlibc as a replacement to klibc but: |
14 |
- dietlibc is maintained-needed too |
15 |
- it could be a elibc_glibc? in DEPEND but this would probably be a |
16 |
noblah USE flag |
17 |
- it would mean that arches where mksh is believed to work and some of |
18 |
our libc do but not dietlibc or klibc (like alpha with bug #487672) |
19 |
would be prevented from USE=static |
20 |
|
21 |
Closes: https://bugs.gentoo.org/653388 |
22 |
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> |
23 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
24 |
|
25 |
app-shells/mksh/{mksh-9999.ebuild => mksh-57-r2.ebuild} | 16 +++++++++------- |
26 |
app-shells/mksh/mksh-9999.ebuild | 16 +++++++++------- |
27 |
profiles/base/package.use.mask | 4 ++++ |
28 |
profiles/features/musl/package.use.mask | 3 +++ |
29 |
profiles/features/uclibc/package.use.mask | 3 +++ |
30 |
5 files changed, 28 insertions(+), 14 deletions(-) |
31 |
|
32 |
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-57-r2.ebuild |
33 |
similarity index 65% |
34 |
copy from app-shells/mksh/mksh-9999.ebuild |
35 |
copy to app-shells/mksh/mksh-57-r2.ebuild |
36 |
index 3aa638fe245..b818b1caf1a 100644 |
37 |
--- a/app-shells/mksh/mksh-9999.ebuild |
38 |
+++ b/app-shells/mksh/mksh-57-r2.ebuild |
39 |
@@ -13,29 +13,31 @@ if [[ $PV = 9999 ]]; then |
40 |
ECVS_AUTH="ext" |
41 |
KEYWORDS="" |
42 |
else |
43 |
- SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" |
44 |
- KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
45 |
+ SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" |
46 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
47 |
fi |
48 |
|
49 |
DESCRIPTION="MirBSD Korn Shell" |
50 |
+# Host is TLSv1.0-only, keep to http for compatibility with modern browsers |
51 |
HOMEPAGE="http://mirbsd.de/mksh" |
52 |
+ |
53 |
LICENSE="BSD" |
54 |
SLOT="0" |
55 |
IUSE="static test" |
56 |
-RDEPEND="static? ( dev-libs/klibc )" |
57 |
+RESTRICT="!test? ( test )" |
58 |
+ |
59 |
DEPEND=" |
60 |
- ${RDEPEND} |
61 |
test? ( |
62 |
dev-lang/perl |
63 |
sys-apps/ed |
64 |
) |
65 |
" |
66 |
+ |
67 |
S="${WORKDIR}/${PN}" |
68 |
|
69 |
src_compile() { |
70 |
tc-export CC |
71 |
- # we want to build static with klibc |
72 |
- if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi |
73 |
+ use static && export LDSTATIC="-static" |
74 |
export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\"" |
75 |
sh Build.sh -r || die |
76 |
} |
77 |
@@ -48,5 +50,5 @@ src_install() { |
78 |
} |
79 |
|
80 |
src_test() { |
81 |
- ./test.sh -v || die |
82 |
+ ./mksh test.sh -v || die |
83 |
} |
84 |
|
85 |
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild |
86 |
index 3aa638fe245..b818b1caf1a 100644 |
87 |
--- a/app-shells/mksh/mksh-9999.ebuild |
88 |
+++ b/app-shells/mksh/mksh-9999.ebuild |
89 |
@@ -13,29 +13,31 @@ if [[ $PV = 9999 ]]; then |
90 |
ECVS_AUTH="ext" |
91 |
KEYWORDS="" |
92 |
else |
93 |
- SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" |
94 |
- KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
95 |
+ SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" |
96 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
97 |
fi |
98 |
|
99 |
DESCRIPTION="MirBSD Korn Shell" |
100 |
+# Host is TLSv1.0-only, keep to http for compatibility with modern browsers |
101 |
HOMEPAGE="http://mirbsd.de/mksh" |
102 |
+ |
103 |
LICENSE="BSD" |
104 |
SLOT="0" |
105 |
IUSE="static test" |
106 |
-RDEPEND="static? ( dev-libs/klibc )" |
107 |
+RESTRICT="!test? ( test )" |
108 |
+ |
109 |
DEPEND=" |
110 |
- ${RDEPEND} |
111 |
test? ( |
112 |
dev-lang/perl |
113 |
sys-apps/ed |
114 |
) |
115 |
" |
116 |
+ |
117 |
S="${WORKDIR}/${PN}" |
118 |
|
119 |
src_compile() { |
120 |
tc-export CC |
121 |
- # we want to build static with klibc |
122 |
- if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi |
123 |
+ use static && export LDSTATIC="-static" |
124 |
export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\"" |
125 |
sh Build.sh -r || die |
126 |
} |
127 |
@@ -48,5 +50,5 @@ src_install() { |
128 |
} |
129 |
|
130 |
src_test() { |
131 |
- ./test.sh -v || die |
132 |
+ ./mksh test.sh -v || die |
133 |
} |
134 |
|
135 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
136 |
index e5768830f1e..68213dc9054 100644 |
137 |
--- a/profiles/base/package.use.mask |
138 |
+++ b/profiles/base/package.use.mask |
139 |
@@ -7,6 +7,10 @@ |
140 |
# This file is only for generic masks. For arch-specific masks (i.e. |
141 |
# mask everywhere, unmask on arch/*) use arch/base. |
142 |
|
143 |
+# Haelwenn (lanodan) Monnier <contact@×××××××××.me> (2019-12-01) |
144 |
+# broken static-linking in glibc and maybe others |
145 |
+>app-shells/mksh-57-r1 static |
146 |
+ |
147 |
# Andreas Sturmlechner <asturm@g.o> (2019-11-30) |
148 |
# Depends on about-to-be-last-rited media-libs/mediastreamer |
149 |
kde-apps/kopete jingle |
150 |
|
151 |
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask |
152 |
index e8ef0ab07a3..117568e0a6b 100644 |
153 |
--- a/profiles/features/musl/package.use.mask |
154 |
+++ b/profiles/features/musl/package.use.mask |
155 |
@@ -20,3 +20,6 @@ app-shells/bash mem-scramble |
156 |
# lto builds are known to cause an OOM issue during build. |
157 |
mail-client/thunderbird lto |
158 |
www-client/firefox lto |
159 |
+ |
160 |
+# static linking works with musl |
161 |
+app-shells/mksh -static |
162 |
|
163 |
diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask |
164 |
index eb7b5dc0216..b00ae69a84a 100644 |
165 |
--- a/profiles/features/uclibc/package.use.mask |
166 |
+++ b/profiles/features/uclibc/package.use.mask |
167 |
@@ -22,3 +22,6 @@ dev-util/geany-plugins gtkspell |
168 |
# 'append-libs', but xfsdump's build system doesn't honor $LIBS. |
169 |
# So this is the best way for now. See 570548. |
170 |
sys-fs/xfsdump nls |
171 |
+ |
172 |
+# static linking works with uClibc |
173 |
+app-shells/mksh -static |