On Sun, 2024-08-18 at 14:31 -0400, Mike Gilbert wrote:
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 <floppym@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)
Looks good!
-----BEGIN PGP SIGNATURE-----
iQJFBAABCAAvFiEEPxcZ3tkwcedKm2a8EiZBXQDdMTcFAmbDt1URHGNoZXdpQGdl bnRvby5vcmcACgkQEiZBXQDdMTeiiA/8CeMbfzr6E25IKpTKQ/s7k30BW5kBpOTT fJFf5DsZPSQQDdpbhSUXGYT2zQ/MOKbudNWlHddbBHp/18u3Ksu1WMrqP87Pngk2 /KhZ/Syjiy9R6ao4n7WWdOSc5Ay2V4qc2/w1jB1pQM9aamgy5OI/+dKLprIFpupe OMqdSHktGSBJ/mmlZjwVCNrQI/X/5qidH8NpumzdlWJwQqF52oDzFJNgLkbCoYlL 4ppJIkrlGzzfC3y7jZIfrLaNPFSLTeXDFE4ydUL7Mx5aIhqtB/rCbB+vMX1YnLrm s4wfH1EzQ5AdqZQYzTXXpqFWDIx02nLvU/3dTzYeU9wCAaJiOBQVlah0UOD57Rfn /zr/cYwmeAN9GzpSIDDIJEg643V7F9oRiqs9kBoEsGPRNZq8BMzMSVnVrhVWlbaR e3dLWu9ExYGHpeGQF3k3tmzc2sRD5DKxqa54R6XJJQhbBgujy606m9guaZurQEfv 0UEDXKw2w1pdAWU9SySqgdyja3DH31X2eFaC+c9Y3zPM1s9m3YGFWYlac/PTzC6E W8/Tn7Dhrd8VcrglKsbBxu4iso69mWBhlz3vzHQX6pmElXd33mY39l9LuKE7fPzM uFITAfoDbeduorh/SRXmr7/eA5t3HNRQg+WIQAsPAL+74gUr047wWg5lkJM50XDq
lm0WTXym58M=
=XJ4S
-----END PGP SIGNATURE-----
--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)