Re: [gentoo-dev] [PATCH] eclass/lua.eclass: remove EPREFIX from exported paths

[William Hubbs]

I'll fix the subject before I commit.

William

On Thu, Jan 07, 2021 at 05:13:09PM -0600, William Hubbs wrote:
> Bug: https://bugs.gentoo.org/762769
> Signed-off-by: William Hubbs <williamh@g.o>
> ---
>  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 100be14cb08..1e552da0848 100644
> --- a/eclass/lua-utils.eclass
> +++ b/eclass/lua-utils.eclass
> @@ -212,8 +212,10 @@ _lua_get_library_file() {
>  			die "Invalid implementation: ${impl}"
>  			;;
>  	esac
> -	libdir=$($(tc-getPKG_CONFIG) --variable libdir ${impl}) || die
>
> +	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}"
> --
> 2.26.2
>
>