public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/statifier/
Date: Sun, 25 Mar 2018 17:27:30 +0000 (UTC)	[thread overview]
Message-ID: <1521998840.5841ca2f526067efc8c7b0a8b76e46b4e2593b25.mgorny@gentoo> (raw)

commit:     5841ca2f526067efc8c7b0a8b76e46b4e2593b25
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sat Mar 24 15:52:53 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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
 }


             reply	other threads:[~2018-03-25 17:27 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-25 17:27 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-10-10 10:39 [gentoo-commits] repo/gentoo:master commit in: dev-util/statifier/ Conrad Kostecki
2020-09-24 20:20 Conrad Kostecki
2020-09-24  6:46 Agostino Sarubbo
2020-09-20 21:52 Thomas Deutschmann
2020-09-20 15:59 Conrad Kostecki
2020-08-09 20:00 Conrad Kostecki
2018-05-08  7:11 Agostino Sarubbo
2018-05-07 19:22 Thomas Deutschmann
2018-03-23  8:24 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1521998840.5841ca2f526067efc8c7b0a8b76e46b4e2593b25.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox