commit: c05bf0003a8248e01a9663654f160553826f5b85 Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Thu Jan 7 23:11:03 2021 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Mon Jun 7 12:57:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c05bf000
eclass/lua-utils.eclass: remove EPREFIX from exported paths Closes: https://bugs.gentoo.org/768909 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> eclass/lua-utils.eclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass index 0589318ef51..ddf44f354e1 100644 --- a/eclass/lua-utils.eclass +++ b/eclass/lua-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: lua-utils.eclass @@ -212,7 +212,9 @@ _lua_get_library_file() { die "Invalid implementation: ${impl}" ;; esac + libdir=$($(tc-getPKG_CONFIG) --variable libdir ${impl}) || die + libdir="${libdir#${ESYSROOT#${SYSROOT}}}" debug-print "${FUNCNAME}: libdir = ${libdir}, libname = ${libname}" echo "${libdir}/${libname}" @@ -274,6 +276,7 @@ _lua_export() { local val val=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${impl}) || die + val="${val#${ESYSROOT#${SYSROOT}}}" export LUA_CMOD_DIR=${val} debug-print "${FUNCNAME}: LUA_CMOD_DIR = ${LUA_CMOD_DIR}" @@ -282,6 +285,7 @@ _lua_export() { local val val=$($(tc-getPKG_CONFIG) --variable includedir ${impl}) || die + val="${val#${ESYSROOT#${SYSROOT}}}" export LUA_INCLUDE_DIR=${val} debug-print "${FUNCNAME}: LUA_INCLUDE_DIR = ${LUA_INCLUDE_DIR}" @@ -298,6 +302,7 @@ _lua_export() { local val val=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${impl}) || die + val="${val#${ESYSROOT#${SYSROOT}}}" export LUA_LMOD_DIR=${val} debug-print "${FUNCNAME}: LUA_LMOD_DIR = ${LUA_LMOD_DIR}"
