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 AEC7E1382C5 for ; Sun, 25 Mar 2018 17:27:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32B0FE093D; Sun, 25 Mar 2018 17:27: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 03334E0940 for ; Sun, 25 Mar 2018 17:27: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 B8FDF335CBD for ; Sun, 25 Mar 2018 17:27:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C2E3427F for ; Sun, 25 Mar 2018 17:27:30 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1521998840.5841ca2f526067efc8c7b0a8b76e46b4e2593b25.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/statifier/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/statifier/statifier-1.7.4.ebuild X-VCS-Directories: dev-util/statifier/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 5841ca2f526067efc8c7b0a8b76e46b4e2593b25 X-VCS-Branch: master Date: Sun, 25 Mar 2018 17:27:30 +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-Archives-Salt: debac39a-fed0-442a-828a-3998b2278d3d X-Archives-Hash: 29b062490656a6b50573f73ece04d1d1 commit: 5841ca2f526067efc8c7b0a8b76e46b4e2593b25 Author: Conrad Kostecki kostecki com> AuthorDate: Sat Mar 24 15:52:53 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Mar 25 17:27:20 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5841ca2f dev-util/statifier: Don't compile 32-bit on amd64 no-multilib profile Closes: https://bugs.gentoo.org/651260 Closes: https://github.com/gentoo/gentoo/pull/7571 dev-util/statifier/statifier-1.7.4.ebuild | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dev-util/statifier/statifier-1.7.4.ebuild b/dev-util/statifier/statifier-1.7.4.ebuild index 2e2867cd1b9..a90f4825f90 100644 --- a/dev-util/statifier/statifier-1.7.4.ebuild +++ b/dev-util/statifier/statifier-1.7.4.ebuild @@ -3,6 +3,10 @@ EAPI="6" +MULTILIB_COMPAT=( abi_x86_{32,64} ) + +inherit multilib-build + DESCRIPTION="Statifier is a tool for creating portable, self-containing Linux executables" HOMEPAGE="http://statifier.sourceforge.net" SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz" @@ -20,6 +24,11 @@ src_prepare() { # Respect users CFLAGS and LDFLAGS sed -i -e 's/-Wall -O2/$(CFLAGS) $(LDFLAGS)/g' src/Makefile || die + # Don't compile 32-bit on amd64 no-multilib profile + if ! use abi_x86_32; then + sed -i -e 's/ELF32 .*/ELF32 := no/g' configs/config.x86_64 || die + fi + # Apply user patches eapply_user }