Gentoo Archives: gentoo-dev

From: Marek Szuba <marecki@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH 2/2] lua-utils.eclass: support dev-lang/lua:0
Date: Mon, 05 Oct 2020 18:01:57
Message-Id: 20201005180105.217724-3-marecki@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/2] lua-utils.eclass: support LuaJIT and unslotted Lua by Marek Szuba
1 This is to make it possible for the maintainers of Lua-dependent ebuilds
2 to transition to lua{,-single}.eclass without unmasking slotted
3 dev-lang/lua.
4
5 Signed-off-by: Marek Szuba <marecki@g.o>
6 ---
7 eclass/lua-utils.eclass | 8 ++++++++
8 profiles/desc/lua_single_target.desc | 1 +
9 profiles/desc/lua_targets.desc | 1 +
10 3 files changed, 10 insertions(+)
11
12 diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass
13 index 24ef67635d5..b84fb6e9a68 100644
14 --- a/eclass/lua-utils.eclass
15 +++ b/eclass/lua-utils.eclass
16 @@ -38,6 +38,7 @@ inherit toolchain-funcs
17 # All supported Lua implementations, most preferred last
18 _LUA_ALL_IMPLS=(
19 luajit
20 + lua0
21 lua5-1
22 lua5-2
23 lua5-3
24 @@ -211,6 +212,10 @@ _lua_export() {
25 impl=${1}
26 shift
27 ;;
28 + lua0)
29 + impl="lua"
30 + shift
31 + ;;
32 lua*)
33 impl=${1/-/.}
34 shift
35 @@ -272,6 +277,9 @@ _lua_export() {
36 luajit)
37 LUA_PKG_DEP="dev-lang/luajit:="
38 ;;
39 + lua)
40 + LUA_PKG_DEP="dev-lang/lua:0"
41 + ;;
42 lua*)
43 LUA_PKG_DEP="dev-lang/lua:${impl#lua}"
44 ;;
45 diff --git a/profiles/desc/lua_single_target.desc b/profiles/desc/lua_single_target.desc
46 index c3d422e434d..04f71b1fe58 100644
47 --- a/profiles/desc/lua_single_target.desc
48 +++ b/profiles/desc/lua_single_target.desc
49 @@ -3,6 +3,7 @@
50
51 # This file contains descriptions of LUA_SINGLE_TARGET USE_EXPAND flags.
52
53 +lua0 - Build for unslotted Lua only
54 lua5-1 - Build for Lua 5.1 only
55 lua5-2 - Build for Lua 5.2 only
56 lua5-3 - Build for Lua 5.3 only
57 diff --git a/profiles/desc/lua_targets.desc b/profiles/desc/lua_targets.desc
58 index 75b9e0f86af..9f296fe2499 100644
59 --- a/profiles/desc/lua_targets.desc
60 +++ b/profiles/desc/lua_targets.desc
61 @@ -3,6 +3,7 @@
62
63 # This file contains descriptions of LUA_TARGETS USE_EXPAND flags.
64
65 +lua0 - Build with unslotted Lua
66 lua5-1 - Build with Lua 5.1
67 lua5-2 - Build with Lua 5.2
68 lua5-3 - Build with Lua 5.3
69 --
70 2.26.2