From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id ED1AE13888F for ; Sat, 24 Oct 2015 16:33:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E545AE07F9; Sat, 24 Oct 2015 16:33:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D452E07F9 for ; Sat, 24 Oct 2015 16:33:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67784340A33 for ; Sat, 24 Oct 2015 16:33:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5FC417B3 for ; Sat, 24 Oct 2015 16:33:42 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1445704417.1feceeec046b975e842e9ed49bd5f507992d1e7b.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/mpfr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild X-VCS-Directories: dev-libs/mpfr/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 1feceeec046b975e842e9ed49bd5f507992d1e7b X-VCS-Branch: master Date: Sat, 24 Oct 2015 16:33:42 +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: b9f8d423-568c-43f2-b221-8cfe1909b15c X-Archives-Hash: 5ecdae189fb4f40c25b4d89c291397ee commit: 1feceeec046b975e842e9ed49bd5f507992d1e7b Author: Mike Frysinger gentoo org> AuthorDate: Sat Oct 24 16:33:17 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Oct 24 16:33:37 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1feceeec dev-libs/mpfr: add multilib logic to older SLOT #563888 dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild b/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild index f97d812..0bfc14d 100644 --- a/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild +++ b/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ # this ebuild is only for the libmpfr.so.1 ABI SONAME -EAPI="4" +EAPI="5" -inherit eutils libtool flag-o-matic +inherit eutils libtool multilib multilib-minimal flag-o-matic MY_PV=${PV/_p*} MY_P=${PN}-${MY_PV} @@ -19,7 +19,7 @@ SLOT="1" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" -RDEPEND=">=dev-libs/gmp-4.1.4-r2" +RDEPEND=">=dev-libs/gmp-4.1.4-r2:0[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} @@ -31,17 +31,20 @@ src_prepare() { elibtoolize } -src_configure() { +multilib_src_configure() { # Newer gmp has deleted this define, so export it for older mpfr. append-cppflags -D__gmp_const=const + # Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19 + ECONF_SOURCE=${S} \ + user_redefine_cc=yes \ econf --disable-static } -src_compile() { +multilib_src_compile() { emake libmpfr.la } -src_install() { - emake install-libLTLIBRARIES DESTDIR="${D}" +multilib_src_install() { + emake DESTDIR="${D}" install-libLTLIBRARIES rm -f "${ED}"/usr/*/libmpfr.{la,so,dylib,a} }