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 94D941382C5 for ; Sat, 14 Apr 2018 17:41:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02FFAE07F2; Sat, 14 Apr 2018 17:41:48 +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 D578AE07EF for ; Sat, 14 Apr 2018 17:41:47 +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 A8636335C77 for ; Sat, 14 Apr 2018 17:41:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1159C274 for ; Sat, 14 Apr 2018 17:41:45 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1523727675.d7ce5eaedcb745006453047cc258d92accedde90.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: eclass/ X-VCS-Repository: proj/musl X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: d7ce5eaedcb745006453047cc258d92accedde90 X-VCS-Branch: master Date: Sat, 14 Apr 2018 17:41:45 +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: f90ee30a-0b5a-42ac-aef5-1eea5162cbac X-Archives-Hash: ea58858670564e22166f8c4957e09f98 commit: d7ce5eaedcb745006453047cc258d92accedde90 Author: Aric Belsito gmail com> AuthorDate: Sat Apr 14 17:41:15 2018 +0000 Commit: Aric Belsito gmail com> CommitDate: Sat Apr 14 17:41:15 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d7ce5eae toolchain.eclass: sync with upstream eclass/toolchain.eclass | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index df637dc..dee6a88 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -24,8 +24,8 @@ fi FEATURES=${FEATURES/multilib-strict/} case ${EAPI:-0} in - 0|1|2|3) die "Need to upgrade to at least EAPI=4" ;; - 4*|5*) ;; + 0|1|2|3|4*) die "Need to upgrade to at least EAPI=5" ;; + 5*) ;; *) die "I don't speak EAPI ${EAPI}." ;; esac EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \ @@ -166,7 +166,7 @@ RDEPEND="sys-libs/zlib tc_version_is_at_least 3 && RDEPEND+=" virtual/libiconv" if tc_version_is_at_least 4 ; then - GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0" + GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0=" if tc_version_is_at_least 4.3 ; then RDEPEND+=" ${GMP_MPFR_DEPS}" elif in_iuse fortran ; then @@ -174,7 +174,7 @@ if tc_version_is_at_least 4 ; then fi fi -tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1:0" +tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1:0=" if in_iuse objc-gc ; then if tc_version_is_at_least 7 ; then @@ -184,12 +184,12 @@ fi if in_iuse graphite ; then if tc_version_is_at_least 5.0 ; then - RDEPEND+=" graphite? ( >=dev-libs/isl-0.14 )" + RDEPEND+=" graphite? ( >=dev-libs/isl-0.14:0= )" elif tc_version_is_at_least 4.8 ; then RDEPEND+=" graphite? ( - >=dev-libs/cloog-0.18.0 - >=dev-libs/isl-0.11.1 + >=dev-libs/cloog-0.18.0:0= + >=dev-libs/isl-0.11.1:0= )" fi fi @@ -1811,6 +1811,7 @@ toolchain_src_install() { # libsupc++.la: This has no dependencies. # libcc1.la: There is no static library, only dynamic. # libcc1plugin.la: Same as above, and it's loaded via dlopen. + # libcp1plugin.la: Same as above, and it's loaded via dlopen. # libgomp.la: gcc itself handles linkage (libgomp.spec). # libgomp-plugin-*.la: Same as above, and it's an internal plugin only # loaded via dlopen. @@ -1830,6 +1831,7 @@ toolchain_src_install() { -name libsupc++.la -o \ -name libcc1.la -o \ -name libcc1plugin.la -o \ + -name libcp1plugin.la -o \ -name 'libgomp.la' -o \ -name 'libgomp-plugin-*.la' -o \ -name libgfortran.la -o \