From 773fe6f1bc79b72e4a8a145cc2ac4e624205f175 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 26 Aug 2024 07:15:48 +0000 Subject: [PATCH] eclass/lua-utils: Sync with Gentoo It's from Gentoo commit 1f2079f01b0276fe5ac6f8d2270f3a2bad32de61. --- .../portage-stable/eclass/lua-utils.eclass | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/lua-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/lua-utils.eclass index 0ff36734dc..7272f80d03 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/lua-utils.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/lua-utils.eclass @@ -1,10 +1,9 @@ -# 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 # @MAINTAINER: # William Hubbs -# Marek Szuba # @AUTHOR: # Marek Szuba # Based on python-utils-r1.eclass by Michał Górny et al. @@ -144,18 +143,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 +263,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)