Gentoo Archives: gentoo-dev

From: William Hubbs <williamh@g.o>
To: gentoo-dev@l.g.o
Cc: William Hubbs <williamh@g.o>
Subject: [gentoo-dev] [PATCH] eclass/lua.eclass: remove EPREFIX from exported paths
Date: Thu, 07 Jan 2021 23:14:10
Message-Id: 20210107231309.29832-1-williamh@gentoo.org
1 Bug: https://bugs.gentoo.org/762769
2 Signed-off-by: William Hubbs <williamh@g.o>
3 ---
4 eclass/lua-utils.eclass | 7 ++++++-
5 1 file changed, 6 insertions(+), 1 deletion(-)
6
7 diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass
8 index 100be14cb08..1e552da0848 100644
9 --- a/eclass/lua-utils.eclass
10 +++ b/eclass/lua-utils.eclass
11 @@ -212,8 +212,10 @@ _lua_get_library_file() {
12 die "Invalid implementation: ${impl}"
13 ;;
14 esac
15 - libdir=$($(tc-getPKG_CONFIG) --variable libdir ${impl}) || die
16
17 + libdir=$($(tc-getPKG_CONFIG) --variable libdir ${impl}) || die
18 + libdir="${libdir#${ESYSROOT#${SYSROOT}}}"
19 +
20 debug-print "${FUNCNAME}: libdir = ${libdir}, libname = ${libname}"
21 echo "${libdir}/${libname}"
22 }
23 @@ -274,6 +276,7 @@ _lua_export() {
24 local val
25
26 val=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${impl}) || die
27 + val="${val#${ESYSROOT#${SYSROOT}}}"
28
29 export LUA_CMOD_DIR=${val}
30 debug-print "${FUNCNAME}: LUA_CMOD_DIR = ${LUA_CMOD_DIR}"
31 @@ -282,6 +285,7 @@ _lua_export() {
32 local val
33
34 val=$($(tc-getPKG_CONFIG) --variable includedir ${impl}) || die
35 + val="${val#${ESYSROOT#${SYSROOT}}}"
36
37 export LUA_INCLUDE_DIR=${val}
38 debug-print "${FUNCNAME}: LUA_INCLUDE_DIR = ${LUA_INCLUDE_DIR}"
39 @@ -298,6 +302,7 @@ _lua_export() {
40 local val
41
42 val=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${impl}) || die
43 + val="${val#${ESYSROOT#${SYSROOT}}}"
44
45 export LUA_LMOD_DIR=${val}
46 debug-print "${FUNCNAME}: LUA_LMOD_DIR = ${LUA_LMOD_DIR}"
47 --
48 2.26.2

Replies