From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0467A1382C5 for ; Mon, 11 Jan 2021 17:01:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64052E09D7; Mon, 11 Jan 2021 17:01:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1BDABE097E for ; Mon, 11 Jan 2021 17:01:41 +0000 (UTC) Received: (nullmailer pid 15321 invoked by uid 1000); Mon, 11 Jan 2021 17:01:37 -0000 From: William Hubbs To: gentoo-dev@lists.gentoo.org Cc: William Hubbs Subject: [gentoo-dev] [PATCH] eclass/lua-utils.eclass: remove EPREFIX from exported module paths Date: Mon, 11 Jan 2021 11:01:33 -0600 Message-Id: <20210111170133.15275-1-williamh@gentoo.org> X-Mailer: git-send-email 2.26.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 00793300-0dd6-449f-8fff-a576d5f17a93 X-Archives-Hash: 825689d62bd7a7886a1d48e186e02f65 Bug: https://bugs.gentoo.org/762769 Signed-off-by: William Hubbs --- eclass/lua-utils.eclass | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass index 100be14cb08..9fe4d22e93f 100644 --- a/eclass/lua-utils.eclass +++ b/eclass/lua-utils.eclass @@ -212,8 +212,9 @@ _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 + debug-print "${FUNCNAME}: libdir = ${libdir}, libname = ${libname}" echo "${libdir}/${libname}" } @@ -274,6 +275,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 +284,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 +301,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}" @@ -364,11 +368,14 @@ lua_get_CFLAGS() { # @USAGE: [] # @DESCRIPTION: # Obtain and print the name of the directory into which compiled Lua -# modules are installed, for the given implementation. If no implementation +# modules are installed for the given implementation. If no implementation # is provided, ${ELUA} will be used. # -# Please note that this function requires Lua and pkg-config installed, -# and therefore proper build-time dependencies need be added to the ebuild. +# Please note that this function requires Lua and pkg-config to be installed, +# and therefore proper build-time dependencies need to be added to the ebuild. +# +# For prefix installations, this function does not include the offset in +# the path. lua_get_cmod_dir() { debug-print-function ${FUNCNAME} "${@}" @@ -385,6 +392,9 @@ lua_get_cmod_dir() { # # Please note that this function requires Lua and pkg-config installed, # and therefore proper build-time dependencies need be added to the ebuild. +# +# For prefix installations, this function does not include the offset in +# the path. lua_get_include_dir() { debug-print-function ${FUNCNAME} "${@}" @@ -412,11 +422,14 @@ lua_get_LIBS() { # @USAGE: [] # @DESCRIPTION: # Obtain and print the name of the directory into which native-Lua -# modules are installed, for the given implementation. If no implementation +# modules are installed for the given implementation. If no implementation # is provided, ${ELUA} will be used. # # Please note that this function requires Lua and pkg-config installed, # and therefore proper build-time dependencies need be added to the ebuild. +# +# For prefix installations, this function does not include the offset in +# the path. lua_get_lmod_dir() { debug-print-function ${FUNCNAME} "${@}" -- 2.26.2