From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 29 Sep 2015 13:26:19 +0000 (-0400)
Subject: sys-libs/binutils-libs: add multilib support #558902
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d216bebe384a87e1ed336d5124cd5b9c4f61fe9;p=gentoo.git

sys-libs/binutils-libs: add multilib support #558902
---

diff --git a/sys-libs/binutils-libs/binutils-libs-2.25.1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.25.1-r1.ebuild
similarity index 93%
rename from sys-libs/binutils-libs/binutils-libs-2.25.1.ebuild
rename to sys-libs/binutils-libs/binutils-libs-2.25.1-r1.ebuild
index 9faa28dd251d..b6b22066e8d7 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.25.1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.25.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 PATCHVER="1.1"
 
-inherit eutils
+inherit eutils multilib-minimal
 
 MY_PN="binutils"
 MY_P="${MY_PN}-${PV}"
@@ -41,7 +41,7 @@ pkgversion() {
 	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myconf=(
 		$(use_with zlib)
 		--enable-obsolete
@@ -66,12 +66,16 @@ src_configure() {
 		&& myconf+=( --without-included-gettext ) \
 		|| myconf+=( --disable-nls )
 
+	ECONF_SOURCE=${S} \
 	econf "${myconf[@]}"
 }
 
-src_install() {
+multilib_src_install() {
 	default
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
 	# Provide libiberty.h directly.
 	dosym libiberty/libiberty.h /usr/include/libiberty.h
 }
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}