[gentoo-commits] repo/gentoo:master commit in: dev-lang/luajit/

[William Hubbs]

commit:     35539cb231ee30f419937e009b1f3d18ee1a9111
Author:     Manoj Gupta <manojgupta <AT> google <DOT> com>
AuthorDate: Mon Sep 24 23:16:03 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 01:20:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35539cb2

dev-lang/luajit: Fix 2.0.5 cross-compilation build

luajit passes CFLAGS/LDFLAGS to both host and target builds.
This breaks when the host cpu does not support the target flags
e.g. using march=bdver4 in CFLAGS when cross-compiling for AMD
on an Intel host.

Instead, pass the flags in {HOST|TARGET}-{CFLAGS|LDFLAGS} which is
supported by luajit [1].

[1] https://github.com/LuaJIT/LuaJIT/blob/master/doc/install.html#L607

Closes: https://github.com/gentoo/gentoo/pull/9970
Signed-off-by: Manoj Gupta <manojgupta <AT> google.com>
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 dev-lang/luajit/{luajit-2.0.5-r2.ebuild => luajit-2.0.5-r3.ebuild} | 7 +++++++
 .../{luajit-2.1.0_beta3-r1.ebuild => luajit-2.1.0_beta3-r2.ebuild} | 0
 2 files changed, 7 insertions(+)

diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild 
b/dev-lang/luajit/luajit-2.0.5-r3.ebuild
similarity index 87%
rename from dev-lang/luajit/luajit-2.0.5-r2.ebuild
rename to dev-lang/luajit/luajit-2.0.5-r3.ebuild
index 3dd7bad8037..5816d1feccf 100644
--- a/dev-lang/luajit/luajit-2.0.5-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r3.ebuild
@@ -43,10 +43,16 @@ _emake() {
                PREFIX="${EPREFIX}/usr" \
                MULTILIB="$(get_libdir)" \
                DESTDIR="${D}" \
+               CFLAGS="" \
+               LDFLAGS="" \
                HOST_CC="$(tc-getBUILD_CC)" \
+               HOST_CFLAGS="${BUILD_CPPFLAGS} ${BUILD_CFLAGS}" \
+               HOST_LDFLAGS="${BUILD_LDFLAGS}" \
                STATIC_CC="$(tc-getCC)" \
                DYNAMIC_CC="$(tc-getCC) -fPIC" \
                TARGET_LD="$(tc-getCC)" \
+               TARGET_CFLAGS="${CPPFLAGS} ${CFLAGS}" \
+               TARGET_LDFLAGS="${LDFLAGS}" \
                TARGET_AR="$(tc-getAR) rcus" \
                BUILDMODE="$(usex static-libs mixed dynamic)" \
                TARGET_STRIP="true" \
@@ -55,6 +61,7 @@ _emake() {
 }
 
 src_compile() {
+       tc-export_build_env
        _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")"
 }
 

diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild 
b/dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild
similarity index 100%
rename from dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
rename to dev-lang/luajit/luajit-2.1.0_beta3-r2.ebuild