1 |
commit: d51fed45a9067b4ee6c69dc148c61f894d8a6596 |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 25 19:20:38 2019 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 25 20:56:30 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d51fed45 |
7 |
|
8 |
dev-lang/lua: bump to 5.2.4 and 5.3.5, re-add upstream testsuite |
9 |
|
10 |
Package-Manager: Portage-2.3.56, Repoman-2.3.12 |
11 |
Acked-By: Rafael Martins <rafaelmartins <AT> gentoo.org> |
12 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
13 |
|
14 |
dev-lang/lua/Manifest | 4 ++ |
15 |
dev-lang/lua/lua-5.1.5-r100.ebuild | 2 +- |
16 |
dev-lang/lua/lua-5.1.5-r101.ebuild | 2 +- |
17 |
dev-lang/lua/lua-5.1.5-r102.ebuild | 2 +- |
18 |
dev-lang/lua/lua-5.1.5-r4.ebuild | 2 +- |
19 |
dev-lang/lua/lua-5.2.3-r1.ebuild | 2 +- |
20 |
dev-lang/lua/lua-5.2.3-r2.ebuild | 2 +- |
21 |
dev-lang/lua/lua-5.2.3-r3.ebuild | 2 +- |
22 |
dev-lang/lua/lua-5.2.3.ebuild | 2 +- |
23 |
.../lua/{lua-5.2.3-r2.ebuild => lua-5.2.4.ebuild} | 49 ++++++++++++++++++---- |
24 |
dev-lang/lua/lua-5.3.3-r1.ebuild | 2 +- |
25 |
dev-lang/lua/lua-5.3.3-r2.ebuild | 2 +- |
26 |
dev-lang/lua/lua-5.3.3.ebuild | 2 +- |
27 |
.../lua/{lua-5.3.3-r2.ebuild => lua-5.3.5.ebuild} | 43 +++++++++++++++++-- |
28 |
dev-lang/lua/metadata.xml | 5 ++- |
29 |
15 files changed, 100 insertions(+), 23 deletions(-) |
30 |
|
31 |
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest |
32 |
index 98e8d86978e..1106de1d1a2 100644 |
33 |
--- a/dev-lang/lua/Manifest |
34 |
+++ b/dev-lang/lua/Manifest |
35 |
@@ -1,3 +1,7 @@ |
36 |
DIST lua-5.1.5.tar.gz 221213 BLAKE2B 915eb8e8c9d7e460eacf1d7a59309c60dfc0f5d9d3d76fbc9764e7cae85920b95096db1c27b69ac53378a145c29efde403e88166a1332a67150d9d3a897aba02 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9 |
37 |
+DIST lua-5.2.2-tests.tar.gz 76629 BLAKE2B 323eaae02ee61cfde2535d606ed704d964461c32627cb3ad4097afdc95a16a0921b9b05677c5b9b26cbff0d7d8270045e7df32a2cea0fd99a82e6aa613a0bdae SHA512 699d5703dd1d03312f1e947ca4c68d8808bb226ae01337202c2bfb3d854a9b7d9ef9746630afd1f67e9ffe2868907ce3d600a6f5324a2c798540c5373a24aac8 |
38 |
DIST lua-5.2.3.tar.gz 251195 BLAKE2B f3d11e180fe070cb5be98f0694081d26067e21eddeb09cd74b1bae6ecf01c53dc46746b871e38555525da155bf1b83f0e60bae5387c2b96b1d19b15f94b716dc SHA512 264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449 |
39 |
+DIST lua-5.2.4.tar.gz 252651 BLAKE2B 6f20308d8413438f8446040e8de16274837cb55e626b98a0ae8cfe279dc8610fa2e032a2ce53ef3acda4b96a7198123cbc18eff16775f952e6dc0355fdf331b0 SHA512 cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c |
40 |
DIST lua-5.3.3.tar.gz 294290 BLAKE2B 8052d3fa5f34636df314886a62d63e46fc76ada765679da9352e751f484a458404ac55e5b32ad63ced9d2b16d629d62a52240b1b1a509bcdf5d5df85e405646d SHA512 7b8122ed48ea2a9faa47d1b69b4a5b1523bb7be67e78f252bb4339bf75e957a88c5405156e22b4b63ccf607a5407bf017a4cee1ce12b1aa5262047655960a3cc |
41 |
+DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0efb224afb4828871ac085a3d64c41d674a6f9369035de01ed1f7f75a3d2ce16917f37e774e923216aac0be03e09 SHA512 79575d100a2efabc8243f55b55d912443e09ef7e8b0219cb93541d85c2ba802fb9538015e1228703f09ca57bdb28a640a8f1fa0735716ba1e4bca2179c712dfb |
42 |
+DIST lua-5.3.5.tar.gz 303543 BLAKE2B 8890fa70fcfb869296bc74c754dc30621a3786d4b38dd35ef9e57ca46ee4b3df12dac1b86109be0823847499ff6b0d95de11f446c4c22de440ae3bb704e5068b SHA512 4f9516acc4659dfd0a9e911bfa00c0788f0ad9348e5724fe8fb17aac59e9c0060a64378f82be86f8534e49c6c013e7488ad17321bafcc787831d3d67406bd0f4 |
43 |
|
44 |
diff --git a/dev-lang/lua/lua-5.1.5-r100.ebuild b/dev-lang/lua/lua-5.1.5-r100.ebuild |
45 |
index f532abb7f4f..2ea293401de 100644 |
46 |
--- a/dev-lang/lua/lua-5.1.5-r100.ebuild |
47 |
+++ b/dev-lang/lua/lua-5.1.5-r100.ebuild |
48 |
@@ -1,4 +1,4 @@ |
49 |
-# Copyright 1999-2017 Gentoo Foundation |
50 |
+# Copyright 1999-2019 Gentoo Authors |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
|
53 |
EAPI=5 |
54 |
|
55 |
diff --git a/dev-lang/lua/lua-5.1.5-r101.ebuild b/dev-lang/lua/lua-5.1.5-r101.ebuild |
56 |
index 94a5f0a3080..b26dc779b90 100644 |
57 |
--- a/dev-lang/lua/lua-5.1.5-r101.ebuild |
58 |
+++ b/dev-lang/lua/lua-5.1.5-r101.ebuild |
59 |
@@ -1,4 +1,4 @@ |
60 |
-# Copyright 1999-2017 Gentoo Foundation |
61 |
+# Copyright 1999-2019 Gentoo Authors |
62 |
# Distributed under the terms of the GNU General Public License v2 |
63 |
|
64 |
EAPI=5 |
65 |
|
66 |
diff --git a/dev-lang/lua/lua-5.1.5-r102.ebuild b/dev-lang/lua/lua-5.1.5-r102.ebuild |
67 |
index cfd1cdfe50e..4849b6596ff 100644 |
68 |
--- a/dev-lang/lua/lua-5.1.5-r102.ebuild |
69 |
+++ b/dev-lang/lua/lua-5.1.5-r102.ebuild |
70 |
@@ -1,4 +1,4 @@ |
71 |
-# Copyright 1999-2017 Gentoo Foundation |
72 |
+# Copyright 1999-2019 Gentoo Authors |
73 |
# Distributed under the terms of the GNU General Public License v2 |
74 |
|
75 |
EAPI=5 |
76 |
|
77 |
diff --git a/dev-lang/lua/lua-5.1.5-r4.ebuild b/dev-lang/lua/lua-5.1.5-r4.ebuild |
78 |
index 4917c1a9227..74650eb17ed 100644 |
79 |
--- a/dev-lang/lua/lua-5.1.5-r4.ebuild |
80 |
+++ b/dev-lang/lua/lua-5.1.5-r4.ebuild |
81 |
@@ -1,4 +1,4 @@ |
82 |
-# Copyright 1999-2018 Gentoo Authors |
83 |
+# Copyright 1999-2019 Gentoo Authors |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
|
86 |
EAPI=5 |
87 |
|
88 |
diff --git a/dev-lang/lua/lua-5.2.3-r1.ebuild b/dev-lang/lua/lua-5.2.3-r1.ebuild |
89 |
index 479f20de07d..e4c08ff092a 100644 |
90 |
--- a/dev-lang/lua/lua-5.2.3-r1.ebuild |
91 |
+++ b/dev-lang/lua/lua-5.2.3-r1.ebuild |
92 |
@@ -1,4 +1,4 @@ |
93 |
-# Copyright 1999-2017 Gentoo Foundation |
94 |
+# Copyright 1999-2019 Gentoo Authors |
95 |
# Distributed under the terms of the GNU General Public License v2 |
96 |
|
97 |
EAPI=5 |
98 |
|
99 |
diff --git a/dev-lang/lua/lua-5.2.3-r2.ebuild b/dev-lang/lua/lua-5.2.3-r2.ebuild |
100 |
index 0021ce6efd5..24002f6d519 100644 |
101 |
--- a/dev-lang/lua/lua-5.2.3-r2.ebuild |
102 |
+++ b/dev-lang/lua/lua-5.2.3-r2.ebuild |
103 |
@@ -1,4 +1,4 @@ |
104 |
-# Copyright 1999-2017 Gentoo Foundation |
105 |
+# Copyright 1999-2019 Gentoo Authors |
106 |
# Distributed under the terms of the GNU General Public License v2 |
107 |
|
108 |
EAPI=5 |
109 |
|
110 |
diff --git a/dev-lang/lua/lua-5.2.3-r3.ebuild b/dev-lang/lua/lua-5.2.3-r3.ebuild |
111 |
index 4096b356b1c..6e8d314636b 100644 |
112 |
--- a/dev-lang/lua/lua-5.2.3-r3.ebuild |
113 |
+++ b/dev-lang/lua/lua-5.2.3-r3.ebuild |
114 |
@@ -1,4 +1,4 @@ |
115 |
-# Copyright 1999-2017 Gentoo Foundation |
116 |
+# Copyright 1999-2019 Gentoo Authors |
117 |
# Distributed under the terms of the GNU General Public License v2 |
118 |
|
119 |
EAPI=5 |
120 |
|
121 |
diff --git a/dev-lang/lua/lua-5.2.3.ebuild b/dev-lang/lua/lua-5.2.3.ebuild |
122 |
index 30bfdb2bbb1..11bdc573aa1 100644 |
123 |
--- a/dev-lang/lua/lua-5.2.3.ebuild |
124 |
+++ b/dev-lang/lua/lua-5.2.3.ebuild |
125 |
@@ -1,4 +1,4 @@ |
126 |
-# Copyright 1999-2016 Gentoo Foundation |
127 |
+# Copyright 1999-2019 Gentoo Authors |
128 |
# Distributed under the terms of the GNU General Public License v2 |
129 |
|
130 |
EAPI=5 |
131 |
|
132 |
diff --git a/dev-lang/lua/lua-5.2.3-r2.ebuild b/dev-lang/lua/lua-5.2.4.ebuild |
133 |
similarity index 74% |
134 |
copy from dev-lang/lua/lua-5.2.3-r2.ebuild |
135 |
copy to dev-lang/lua/lua-5.2.4.ebuild |
136 |
index 0021ce6efd5..a5e2cee1d0f 100644 |
137 |
--- a/dev-lang/lua/lua-5.2.3-r2.ebuild |
138 |
+++ b/dev-lang/lua/lua-5.2.4.ebuild |
139 |
@@ -1,4 +1,4 @@ |
140 |
-# Copyright 1999-2017 Gentoo Foundation |
141 |
+# Copyright 1999-2019 Gentoo Authors |
142 |
# Distributed under the terms of the GNU General Public License v2 |
143 |
|
144 |
EAPI=5 |
145 |
@@ -7,12 +7,17 @@ inherit eutils autotools multilib multilib-minimal portability toolchain-funcs v |
146 |
|
147 |
DESCRIPTION="A powerful light-weight programming language designed for extending applications" |
148 |
HOMEPAGE="http://www.lua.org/" |
149 |
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz" |
150 |
+TEST_PV="5.2.2" # no 5.2.3-specific release yet |
151 |
+TEST_A="${PN}-${TEST_PV}-tests.tar.gz" |
152 |
+PKG_A="${P}.tar.gz" |
153 |
+SRC_URI=" |
154 |
+ http://www.lua.org/ftp/${PKG_A} |
155 |
+ test? ( https://www.lua.org/tests/${TEST_A} )" |
156 |
|
157 |
LICENSE="MIT" |
158 |
SLOT="5.2" |
159 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
160 |
-IUSE="+deprecated emacs readline static" |
161 |
+IUSE="+deprecated emacs readline static test test-complete" |
162 |
|
163 |
RDEPEND="readline? ( sys-libs/readline:0= ) |
164 |
app-eselect/eselect-lua |
165 |
@@ -62,15 +67,15 @@ src_prepare() { |
166 |
cp "${FILESDIR}/configure.in" "${S}"/ || die |
167 |
eautoreconf |
168 |
|
169 |
- # custom Makefiles |
170 |
- multilib_copy_sources |
171 |
- |
172 |
# A slotted Lua uses different directories for headers & names for |
173 |
# libraries, and pkgconfig should reflect that. |
174 |
sed -r -i \ |
175 |
-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \ |
176 |
-e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \ |
177 |
"${S}"/etc/lua.pc |
178 |
+ |
179 |
+ # custom Makefiles |
180 |
+ multilib_copy_sources |
181 |
} |
182 |
|
183 |
multilib_src_configure() { |
184 |
@@ -140,4 +145,34 @@ multilib_src_install_all() { |
185 |
|
186 |
# Makefile contains a dummy target that doesn't do tests |
187 |
# but causes issues with slotted lua (bug #510360) |
188 |
-src_test() { :; } |
189 |
+src_test() { |
190 |
+ debug-print-function ${FUNCNAME} "$@" |
191 |
+ cd "${WORKDIR}/lua-${TEST_PV}-tests" || die |
192 |
+ # https://www.lua.org/tests/ |
193 |
+ # There are two sets: |
194 |
+ # basic |
195 |
+ # complete. |
196 |
+ # |
197 |
+ # The basic subset is selected by passing -e'_U=true' |
198 |
+ # The complete set is noted to contain tests that may consume too much memory or have non-portable tests. |
199 |
+ # attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI) |
200 |
+ use test-complete || TEST_OPTS="-e_U=true" |
201 |
+ TEST_MARKER="${T}/test.failed" |
202 |
+ rm -f "${TEST_MARKER}" |
203 |
+ |
204 |
+ # If we are failing, set the marker file, and only check it after done all ABIs |
205 |
+ abi_src_test() { |
206 |
+ debug-print-function ${FUNCNAME} "$@" |
207 |
+ TEST_LOG="${T}/test.${MULTIBUILD_ID}.log" |
208 |
+ eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die |
209 |
+ grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}" |
210 |
+ return 0 |
211 |
+ } |
212 |
+ |
213 |
+ multilib_foreach_abi abi_src_test |
214 |
+ |
215 |
+ if [ -e "${TEST_MARKER}" ]; then |
216 |
+ cat "${TEST_MARKER}" |
217 |
+ die "Tests failed" |
218 |
+ fi |
219 |
+} |
220 |
|
221 |
diff --git a/dev-lang/lua/lua-5.3.3-r1.ebuild b/dev-lang/lua/lua-5.3.3-r1.ebuild |
222 |
index 8addb54fd3e..0a325d68095 100644 |
223 |
--- a/dev-lang/lua/lua-5.3.3-r1.ebuild |
224 |
+++ b/dev-lang/lua/lua-5.3.3-r1.ebuild |
225 |
@@ -1,4 +1,4 @@ |
226 |
-# Copyright 1999-2017 Gentoo Foundation |
227 |
+# Copyright 1999-2019 Gentoo Authors |
228 |
# Distributed under the terms of the GNU General Public License v2 |
229 |
|
230 |
EAPI=5 |
231 |
|
232 |
diff --git a/dev-lang/lua/lua-5.3.3-r2.ebuild b/dev-lang/lua/lua-5.3.3-r2.ebuild |
233 |
index b813a414cb9..61daaebe022 100644 |
234 |
--- a/dev-lang/lua/lua-5.3.3-r2.ebuild |
235 |
+++ b/dev-lang/lua/lua-5.3.3-r2.ebuild |
236 |
@@ -1,4 +1,4 @@ |
237 |
-# Copyright 1999-2017 Gentoo Foundation |
238 |
+# Copyright 1999-2019 Gentoo Authors |
239 |
# Distributed under the terms of the GNU General Public License v2 |
240 |
|
241 |
EAPI=5 |
242 |
|
243 |
diff --git a/dev-lang/lua/lua-5.3.3.ebuild b/dev-lang/lua/lua-5.3.3.ebuild |
244 |
index 89fd40c75eb..234b85a128c 100644 |
245 |
--- a/dev-lang/lua/lua-5.3.3.ebuild |
246 |
+++ b/dev-lang/lua/lua-5.3.3.ebuild |
247 |
@@ -1,4 +1,4 @@ |
248 |
-# Copyright 1999-2017 Gentoo Foundation |
249 |
+# Copyright 1999-2019 Gentoo Authors |
250 |
# Distributed under the terms of the GNU General Public License v2 |
251 |
|
252 |
EAPI=5 |
253 |
|
254 |
diff --git a/dev-lang/lua/lua-5.3.3-r2.ebuild b/dev-lang/lua/lua-5.3.5.ebuild |
255 |
similarity index 74% |
256 |
copy from dev-lang/lua/lua-5.3.3-r2.ebuild |
257 |
copy to dev-lang/lua/lua-5.3.5.ebuild |
258 |
index b813a414cb9..99b6b206377 100644 |
259 |
--- a/dev-lang/lua/lua-5.3.3-r2.ebuild |
260 |
+++ b/dev-lang/lua/lua-5.3.5.ebuild |
261 |
@@ -1,4 +1,4 @@ |
262 |
-# Copyright 1999-2017 Gentoo Foundation |
263 |
+# Copyright 1999-2019 Gentoo Authors |
264 |
# Distributed under the terms of the GNU General Public License v2 |
265 |
|
266 |
EAPI=5 |
267 |
@@ -7,12 +7,17 @@ inherit eutils autotools multilib multilib-minimal portability toolchain-funcs v |
268 |
|
269 |
DESCRIPTION="A powerful light-weight programming language designed for extending applications" |
270 |
HOMEPAGE="http://www.lua.org/" |
271 |
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz" |
272 |
+TEST_PV="5.3.4" # no 5.3.5-specific release yet |
273 |
+TEST_A="${PN}-${TEST_PV}-tests.tar.gz" |
274 |
+PKG_A="${P}.tar.gz" |
275 |
+SRC_URI=" |
276 |
+ http://www.lua.org/ftp/${PKG_A} |
277 |
+ test? ( https://www.lua.org/tests/${TEST_A} )" |
278 |
|
279 |
LICENSE="MIT" |
280 |
SLOT="5.3" |
281 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
282 |
-IUSE="+deprecated emacs readline static" |
283 |
+IUSE="+deprecated emacs readline static test test-complete" |
284 |
|
285 |
RDEPEND="readline? ( sys-libs/readline:0= ) |
286 |
app-eselect/eselect-lua |
287 |
@@ -140,4 +145,34 @@ multilib_src_install_all() { |
288 |
|
289 |
# Makefile contains a dummy target that doesn't do tests |
290 |
# but causes issues with slotted lua (bug #510360) |
291 |
-src_test() { :; } |
292 |
+src_test() { |
293 |
+ debug-print-function ${FUNCNAME} "$@" |
294 |
+ cd "${WORKDIR}/lua-${TEST_PV}-tests" || die |
295 |
+ # https://www.lua.org/tests/ |
296 |
+ # There are two sets: |
297 |
+ # basic |
298 |
+ # complete. |
299 |
+ # |
300 |
+ # The basic subset is selected by passing -e'_U=true' |
301 |
+ # The complete set is noted to contain tests that may consume too much memory or have non-portable tests. |
302 |
+ # attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI) |
303 |
+ use test-complete || TEST_OPTS="-e_U=true" |
304 |
+ TEST_MARKER="${T}/test.failed" |
305 |
+ rm -f "${TEST_MARKER}" |
306 |
+ |
307 |
+ # If we are failing, set the marker file, and only check it after done all ABIs |
308 |
+ abi_src_test() { |
309 |
+ debug-print-function ${FUNCNAME} "$@" |
310 |
+ TEST_LOG="${T}/test.${MULTIBUILD_ID}.log" |
311 |
+ eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die |
312 |
+ grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}" |
313 |
+ return 0 |
314 |
+ } |
315 |
+ |
316 |
+ multilib_foreach_abi abi_src_test |
317 |
+ |
318 |
+ if [ -e "${TEST_MARKER}" ]; then |
319 |
+ cat "${TEST_MARKER}" |
320 |
+ die "Tests failed" |
321 |
+ fi |
322 |
+} |
323 |
|
324 |
diff --git a/dev-lang/lua/metadata.xml b/dev-lang/lua/metadata.xml |
325 |
index 0e7b568c389..06a68a0e049 100644 |
326 |
--- a/dev-lang/lua/metadata.xml |
327 |
+++ b/dev-lang/lua/metadata.xml |
328 |
@@ -9,5 +9,8 @@ |
329 |
<email>williamh@g.o</email> |
330 |
<name>William Hubbs</name> |
331 |
</maintainer> |
332 |
-<use><flag name="deprecated">make deprecated data structures/routines available</flag></use> |
333 |
+<use> |
334 |
+ <flag name="deprecated">make deprecated data structures/routines available</flag> |
335 |
+ <flag name="test-complete">Run the complete (non-portable) testsuite</flag> |
336 |
+</use> |
337 |
</pkgmetadata> |