1 |
commit: d9c8bde42bba32c9b5c09096a039902de6ce9fbe |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 10 18:51:35 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 10 18:51:35 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c8bde4 |
7 |
|
8 |
app-shells/ksh: bump to 2020.0.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.76_p10, Repoman-2.3.17_p62 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
app-shells/ksh/Manifest | 5 +-- |
14 |
.../ksh/files/ksh-2020.0.0-ensure-user-set.patch | 30 ++++++++++++++++++ |
15 |
.../ksh/files/ksh-2020.0.0-skip-api-test.patch | 36 ++++++++++++++++++++++ |
16 |
...h-2020.0.0_beta1.ebuild => ksh-2020.0.0.ebuild} | 17 ++++++++++ |
17 |
app-shells/ksh/ksh-2020.0.0_alpha1.ebuild | 33 -------------------- |
18 |
5 files changed, 84 insertions(+), 37 deletions(-) |
19 |
|
20 |
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest |
21 |
index b16fc0418a8..13f85b68ced 100644 |
22 |
--- a/app-shells/ksh/Manifest |
23 |
+++ b/app-shells/ksh/Manifest |
24 |
@@ -1,4 +1 @@ |
25 |
-DIST ksh-2020.0.0-alpha1-conftab.patch 118773 BLAKE2B 63466e18a77cb86af80d6f6b4af74e3ac1edbfa735decfcd772633808a4593f6d4b057a99547482d17b22445e68c6d3e2becdf68516f913c73550da718f2abc3 SHA512 b29a70e8e31a259ac5bf556ddcdb5d4742a8dac4d11c06e4b5fc3043012e08b26d136cce8c18e9e8a1fe751044699d2258388d618408b09379732bea89a51765 |
26 |
-DIST ksh-2020.0.0-alpha1-solaris.patch 12317 BLAKE2B 90681bde2f3bad0e097a9367ea5a3f1d4c95f70c6e0c872dad769609f97a6332328e21399a3b9ba20f3840b3387a02370831ae4663457728bd8e41b7471c675b SHA512 5a0b818f44a860210e2a7795335d0edec01c61dd5ad04670bb2ca505690ff1b111dbda12d0d15e8b264113d4e7a5a42a49f64c9aba0cff809c2ce3185921acad |
27 |
-DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981 |
28 |
-DIST ksh-2020.0.0-beta1.tar.gz 2022254 BLAKE2B 650ad8ea1140bdbe1fb9fc3e2ecbceedb4605525523584d9ac8a067511ed385f1c83d284c781b31140760500f3de13d1ad8fc695c9c553a3285d5c286a99c7ea SHA512 6f54cdc3c59b44055cc6b670b38ce1685463c841a093a28c5f974dd153eaec3b8924308b353ed7c29a0ec3917ee87cfe57b6cabaca9841633d3599d9c6731330 |
29 |
+DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb4444042c26bfaf1792 |
30 |
|
31 |
diff --git a/app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch b/app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..9f5d70f4d33 |
34 |
--- /dev/null |
35 |
+++ b/app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch |
36 |
@@ -0,0 +1,30 @@ |
37 |
+From cb9f6d3498622b46de021a7f4798512d203747e9 Mon Sep 17 00:00:00 2001 |
38 |
+From: Kurtis Rader <krader@××××××××××.us> |
39 |
+Date: Sun, 1 Sep 2019 15:44:40 -0700 |
40 |
+Subject: [PATCH] Ensure USER is set when unit tests run |
41 |
+ |
42 |
+Related #1391 |
43 |
+--- |
44 |
+ src/cmd/ksh93/tests/util/run_test.sh | 9 +++++++++ |
45 |
+ 1 file changed, 9 insertions(+) |
46 |
+ |
47 |
+diff --git a/src/cmd/ksh93/tests/util/run_test.sh b/src/cmd/ksh93/tests/util/run_test.sh |
48 |
+index 20d24ed1fda..ebc74770cae 100644 |
49 |
+--- a/src/cmd/ksh93/tests/util/run_test.sh |
50 |
++++ b/src/cmd/ksh93/tests/util/run_test.sh |
51 |
+@@ -62,6 +62,15 @@ fi |
52 |
+ # |
53 |
+ export OS_NAME=$(uname -s | tr '[A-Z]' '[a-z]') |
54 |
+ |
55 |
++# |
56 |
++# Make sure $USER is set. A CI/CB environment might not set it. |
57 |
++# See https://github.com/att/ast/issues/1391 |
58 |
++# |
59 |
++if [[ -z $USER ]] |
60 |
++then |
61 |
++ export USER=$(id -un) |
62 |
++fi |
63 |
++ |
64 |
+ # TODO: Enable the `io` test on Travis macOS once we understand why it dies from an abort(). |
65 |
+ # I'm not seeing that failure happen on either of my macOS 10.12 or 10.13 systems. |
66 |
+ if [[ $test_name == io && $OS_NAME == darwin && $CI == true ]] |
67 |
|
68 |
diff --git a/app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch b/app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch |
69 |
new file mode 100644 |
70 |
index 00000000000..f832d175454 |
71 |
--- /dev/null |
72 |
+++ b/app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch |
73 |
@@ -0,0 +1,36 @@ |
74 |
+From d89753b5d38482f4a3f17ba3b7d09ab07cfe7419 Mon Sep 17 00:00:00 2001 |
75 |
+From: Kurtis Rader <krader@××××××××××.us> |
76 |
+Date: Sun, 1 Sep 2019 13:47:40 -0700 |
77 |
+Subject: [PATCH] Skip API test if build type != debug |
78 |
+ |
79 |
+Fixes #1390 |
80 |
+--- |
81 |
+ src/lib/libast/tests/misc/meson.build | 8 +++++++- |
82 |
+ 1 file changed, 7 insertions(+), 1 deletion(-) |
83 |
+ |
84 |
+diff --git a/src/lib/libast/tests/misc/meson.build b/src/lib/libast/tests/misc/meson.build |
85 |
+index 67a178762fa..a4c864428d8 100644 |
86 |
+--- a/src/lib/libast/tests/misc/meson.build |
87 |
++++ b/src/lib/libast/tests/misc/meson.build |
88 |
+@@ -10,6 +10,12 @@ tests_to_skip = [ |
89 |
+ ['freebsd', 'debug'], |
90 |
+ ] |
91 |
+ |
92 |
++# Non-debug build types affect the behavior of `backtrace()`. Which means it will almost certainly |
93 |
++# break the "debug" test. See https://github.com/att/ast/issues/1390. |
94 |
++if get_option('buildtype') != 'debug' |
95 |
++ tests_to_skip += [['*', 'debug']] |
96 |
++endif |
97 |
++ |
98 |
+ foreach test_name: tests |
99 |
+ # If the platform doesn't have an execinfo.h header there is no point in trying to run the |
100 |
+ # debug.c unit test. |
101 |
+@@ -18,7 +24,7 @@ foreach test_name: tests |
102 |
+ endif |
103 |
+ skip_test = false |
104 |
+ foreach skip : tests_to_skip |
105 |
+- if system == skip[0] and test_name == skip[1] |
106 |
++ if ('*' == skip[0] or system == skip[0]) and test_name == skip[1] |
107 |
+ warning('skipping ' + test_name + ' on ' + system) |
108 |
+ skip_test = true |
109 |
+ # break # Not until meson 0.49 |
110 |
|
111 |
diff --git a/app-shells/ksh/ksh-2020.0.0_beta1.ebuild b/app-shells/ksh/ksh-2020.0.0.ebuild |
112 |
similarity index 67% |
113 |
rename from app-shells/ksh/ksh-2020.0.0_beta1.ebuild |
114 |
rename to app-shells/ksh/ksh-2020.0.0.ebuild |
115 |
index 2ccad3528bf..c2f9bb7797e 100644 |
116 |
--- a/app-shells/ksh/ksh-2020.0.0_beta1.ebuild |
117 |
+++ b/app-shells/ksh/ksh-2020.0.0.ebuild |
118 |
@@ -24,6 +24,23 @@ SLOT="0" |
119 |
|
120 |
RDEPEND="!app-shells/pdksh" |
121 |
|
122 |
+PATCHES=( |
123 |
+ "${FILESDIR}"/ksh-2020.0.0-ensure-user-set.patch |
124 |
+ "${FILESDIR}"/ksh-2020.0.0-skip-api-test.patch |
125 |
+) |
126 |
+ |
127 |
+src_test() { |
128 |
+ local cmd=( |
129 |
+ meson test |
130 |
+ -C "${BUILD_DIR}" |
131 |
+ --num-processes "$(makeopts_jobs ${NINJAOPTS:-${MAKEOPTS}})" |
132 |
+ ) |
133 |
+ |
134 |
+ echo "${cmd[@]}" >&2 |
135 |
+ # https://github.com/att/ast/issues/1392 |
136 |
+ env -u T "${cmd[@]}" || die |
137 |
+} |
138 |
+ |
139 |
src_install() { |
140 |
meson_src_install |
141 |
dodir /bin |
142 |
|
143 |
diff --git a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild |
144 |
deleted file mode 100644 |
145 |
index 3c91825f17c..00000000000 |
146 |
--- a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild |
147 |
+++ /dev/null |
148 |
@@ -1,33 +0,0 @@ |
149 |
-# Copyright 1999-2019 Gentoo Authors |
150 |
-# Distributed under the terms of the GNU General Public License v2 |
151 |
- |
152 |
-EAPI=7 |
153 |
- |
154 |
-inherit meson |
155 |
- |
156 |
-DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" |
157 |
-HOMEPAGE="https://github.com/att/ast" |
158 |
- |
159 |
-MY_PV="${PV/_/-}" |
160 |
-MY_P="${PN}-${MY_PV}" |
161 |
-SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz |
162 |
- https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ${MY_P}-solaris.patch |
163 |
- https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ${MY_P}-conftab.patch" |
164 |
-S="${WORKDIR}/${MY_P}" |
165 |
- |
166 |
-LICENSE="CPL-1.0 EPL-1.0" |
167 |
-SLOT="0" |
168 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
169 |
- |
170 |
-RDEPEND="!app-shells/pdksh" |
171 |
- |
172 |
-PATCHES=( |
173 |
- "${DISTDIR}"/${MY_P}-solaris.patch |
174 |
- "${DISTDIR}"/${MY_P}-conftab.patch |
175 |
-) |
176 |
- |
177 |
-src_install() { |
178 |
- meson_src_install |
179 |
- dodir /bin |
180 |
- mv "${ED}/usr/bin/ksh" "${ED}/bin/ksh" || die |
181 |
-} |