From 205b0f865a75f324a828a7c8725f8893b76cecfb Mon Sep 17 00:00:00 2001 From: Marek Szuba Date: Tue, 22 Dec 2020 17:20:32 +0000 Subject: x11-themes/gtk-engines-2.20.2-r100: make USE=lua work for non-native ABIs As predicted, I have ended up simply patching configure. Closes: https://bugs.gentoo.org/752888 Signed-off-by: Marek Szuba --- .../gtk-engines/gtk-engines-2.20.2-r100.ebuild | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'x11-themes') diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild index 597dc742bc9a..39c7e74458e0 100644 --- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild +++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild @@ -42,25 +42,19 @@ PATCHES=( src_prepare() { gnome2_src_prepare + # pkgconfig wrapper set up by lua-single.eclass is not multilib-compatible + # at present so point Autoconf directly to the correct implementation. + # We patch configure rather than configure.ac because running 'eautoreconf' + # results for some reason in corrupted test Makefiles. + sed -i -e "s|\"lua\"|\"${ELUA}\"|g" configure || die } multilib_src_configure() { local confopts=( --enable-animation + $(use_enable lua) + $(use_with lua system-lua) ) - # TODO: fix system-lua detection so that it works for non-native ABIs, - # native builds rely on the pkgconfig wrapper set up by lua-single.eclass - # but that wrapper is not multilib-compatible. - if multilib_is_native_abi; then - confopts+=( - $(use_enable lua) - $(use_with lua system-lua) - ) - else - confopts+=( - --disable-lua - ) - fi ECONF_SOURCE=${S} gnome2_src_configure "${confopts[@]}" } -- cgit v1.2.3-65-gdbad