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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D272F1382C5 for ; Tue, 22 Dec 2020 17:32:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B3CEE0C15; Tue, 22 Dec 2020 17:32:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 048B4E0C15 for ; Tue, 22 Dec 2020 17:32:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03B7E3411AD for ; Tue, 22 Dec 2020 17:32:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C80839F for ; Tue, 22 Dec 2020 17:32:33 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1608658337.205b0f865a75f324a828a7c8725f8893b76cecfb.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/gtk-engines/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild X-VCS-Directories: x11-themes/gtk-engines/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 205b0f865a75f324a828a7c8725f8893b76cecfb X-VCS-Branch: master Date: Tue, 22 Dec 2020 17:32:33 +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: 125524e7-d1de-4454-b5ae-b8b67b995f2e X-Archives-Hash: 89c6c01ea2cb87d17a1ef6c69a9d1d04 commit: 205b0f865a75f324a828a7c8725f8893b76cecfb Author: Marek Szuba gentoo org> AuthorDate: Tue Dec 22 17:20:32 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Tue Dec 22 17:32:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205b0f86 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 gentoo.org> .../gtk-engines/gtk-engines-2.20.2-r100.ebuild | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) 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 597dc742bc9..39c7e74458e 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[@]}" }