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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F05CD15852A for ; Tue, 20 Aug 2024 20:07:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31B042BC023; Tue, 20 Aug 2024 20:07:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0F8352BC023 for ; Tue, 20 Aug 2024 20:07:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1CE8A340C43 for ; Tue, 20 Aug 2024 20:07:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7DAFA1EF1 for ; Tue, 20 Aug 2024 20:07:48 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1724184366.e723fd6d0e2fe4cf134a6c6e064d3faaa77c8339.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/lua-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: e723fd6d0e2fe4cf134a6c6e064d3faaa77c8339 X-VCS-Branch: master Date: Tue, 20 Aug 2024 20:07:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a62c9377-4222-4df1-9b5f-42a792f9acea X-Archives-Hash: 4de49bb69fdecf6b1c45fcad251ac4cc commit: e723fd6d0e2fe4cf134a6c6e064d3faaa77c8339 Author: Mike Gilbert gentoo org> AuthorDate: Sun Aug 18 18:19:23 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Aug 20 20:06:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e723fd6d lua-utils.eclass: use BROOT or ESYSROOT where appropriate The LUA variable points to a lua binary that is likely to be executed by the build system. Use BROOT for this. Use ESYSROOT for the pkg-config symlink, since this is likely used for linking a library. Signed-off-by: Mike Gilbert gentoo.org> eclass/lua-utils.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass index 0ff36734dc8f..c63ec369c1c2 100644 --- a/eclass/lua-utils.eclass +++ b/eclass/lua-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: lua-utils.eclass @@ -144,18 +144,18 @@ _lua_wrapper_setup() { _lua_export "${impl}" ELUA LUA # Lua interpreter - ln -s "${EPREFIX}"/usr/bin/${ELUA} "${workdir}"/bin/lua || die + ln -s "${LUA}" "${workdir}"/bin/lua || die # Lua compiler, or a stub for it in case of luajit if [[ ${ELUA} == luajit ]]; then # Just in case - ln -s "${EPREFIX}"/bin/true "${workdir}"/bin/luac || die + ln -s "${BROOT}"/bin/true "${workdir}"/bin/luac || die else - ln -s "${EPREFIX}"/usr/bin/${ELUA/a/ac} "${workdir}"/bin/luac || die + ln -s "${BROOT}"/usr/bin/${ELUA/a/ac} "${workdir}"/bin/luac || die fi # pkg-config - ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${ELUA}.pc \ + ln -s "${ESYSROOT}"/usr/$(get_libdir)/pkgconfig/${ELUA}.pc \ "${workdir}"/pkgconfig/lua.pc || die fi @@ -264,7 +264,7 @@ _lua_export() { debug-print "${FUNCNAME}: ELUA = ${ELUA}" ;; LUA) - export LUA="${EPREFIX}"/usr/bin/${impl} + export LUA="${BROOT}"/usr/bin/${impl} debug-print "${FUNCNAME}: LUA = ${LUA}" ;; LUA_CFLAGS)