summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2018-01-03 21:52:10 +0100
committerFabian Groffen <grobian@gentoo.org>2018-01-03 21:52:24 +0100
commitc5ac996b9f30b2b6221a67116b4e722cdb2c91e1 (patch)
tree0778ab8782e0b299af483b643fd750771fcad276
parentsys-devel/binutils-apple: restore 3.2 for bootstrapping 10.5 (diff)
downloadgentoo-c5ac996b9f30b2b6221a67116b4e722cdb2c91e1.tar.gz
gentoo-c5ac996b9f30b2b6221a67116b4e722cdb2c91e1.tar.bz2
gentoo-c5ac996b9f30b2b6221a67116b4e722cdb2c91e1.zip
sys-devel/binutils-apple: fix llvm slot-dep
Package-Manager: Portage-2.3.13, Repoman-2.3.3
-rw-r--r--sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild6
-rw-r--r--sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild8
-rw-r--r--sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild8
-rw-r--r--sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild8
-rw-r--r--sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild4
-rw-r--r--sys-devel/binutils-apple/binutils-apple-7.0.ebuild4
-rw-r--r--sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild4
-rw-r--r--sys-devel/binutils-apple/binutils-apple-7.1.ebuild4
-rw-r--r--sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild4
-rw-r--r--sys-devel/binutils-apple/binutils-apple-7.2.ebuild4
-rw-r--r--sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild4
-rw-r--r--sys-devel/binutils-apple/binutils-apple-7.3.ebuild4
-rw-r--r--sys-devel/binutils-apple/binutils-apple-8.1.ebuild4
-rw-r--r--sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild6
-rw-r--r--sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild4
15 files changed, 38 insertions, 38 deletions
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
index 5131c4f35b9..021608d4682 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -26,10 +26,10 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
IUSE="lto test multitarget"
RDEPEND="sys-devel/binutils-config
- lto? ( sys-devel/llvm )"
+ lto? ( sys-devel/llvm:* )"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )
- || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )"
+ || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )"
SLOT="4"
diff --git a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
index 507c8b54be1..4920826c016 100644
--- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -25,12 +25,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
IUSE="lto test libcxx multitarget"
RDEPEND="sys-devel/binutils-config
- lto? ( sys-devel/llvm )
+ lto? ( sys-devel/llvm:* )
libcxx? ( sys-libs/libcxx )"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )
- || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
- libcxx? ( sys-devel/llvm )"
+ || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
+ libcxx? ( sys-devel/llvm:* )"
SLOT="5"
diff --git a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
index 984b3131982..bd320244231 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -26,12 +26,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
IUSE="lto test libcxx multitarget"
RDEPEND="sys-devel/binutils-config
- lto? ( sys-devel/llvm )
+ lto? ( sys-devel/llvm:* )
libcxx? ( sys-libs/libcxx )"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )
- || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
- libcxx? ( sys-devel/llvm )"
+ || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
+ libcxx? ( sys-devel/llvm:* )"
SLOT="6"
diff --git a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
index 371c6a2b6c6..5835b8852a0 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -27,12 +27,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
IUSE="lto test libcxx multitarget"
RDEPEND="sys-devel/binutils-config
- lto? ( sys-devel/llvm )
+ lto? ( sys-devel/llvm:* )
libcxx? ( sys-libs/libcxx )"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )
- || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
- libcxx? ( sys-devel/llvm )"
+ || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
+ libcxx? ( sys-devel/llvm:* )"
SLOT="6"
diff --git a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
index 2eab5e95aab..039399257b2 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -33,7 +33,7 @@ IUSE="lto test multitarget"
# -Wa,-Q but since it's default we make llvm a static runtime dependency.
RDEPEND="sys-devel/binutils-config
lto? ( app-arch/xar )
- sys-devel/llvm
+ sys-devel/llvm:*
sys-libs/libcxx"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
index c81eb3fe54e..805b4d51e50 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -38,7 +38,7 @@ IUSE="test multitarget"
# indirectly makes xar a static runtime dependency.
RDEPEND="sys-devel/binutils-config
app-arch/xar
- sys-devel/llvm
+ sys-devel/llvm:*
sys-libs/libcxx"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
index 6b57a7444fd..6ee67d9bd04 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -33,7 +33,7 @@ IUSE="lto test multitarget"
# -Wa,-Q but since it's default we make llvm a static runtime dependency.
RDEPEND="sys-devel/binutils-config
lto? ( app-arch/xar )
- sys-devel/llvm
+ sys-devel/llvm:*
sys-libs/libcxx"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
index 9dfebf05d00..ed6be55fb9a 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -38,7 +38,7 @@ IUSE="test multitarget"
# indirectly makes xar a static runtime dependency.
RDEPEND="sys-devel/binutils-config
app-arch/xar
- sys-devel/llvm
+ sys-devel/llvm:*
sys-libs/libcxx"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
index e5de0f0f786..8cae70ffc66 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -34,7 +34,7 @@ IUSE="lto test multitarget"
# -Wa,-Q but since it's default we make llvm a static runtime dependency.
RDEPEND="sys-devel/binutils-config
lto? ( app-arch/xar )
- sys-devel/llvm
+ sys-devel/llvm:*
sys-libs/libcxx"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
index 0f608625bca..4f76f80df25 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -38,7 +38,7 @@ IUSE="test multitarget"
# indirectly makes xar a static runtime dependency.
RDEPEND="sys-devel/binutils-config
app-arch/xar
- sys-devel/llvm
+ sys-devel/llvm:*
sys-libs/libcxx"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
index e56d422a78c..1fc16db7730 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -35,7 +35,7 @@ IUSE="lto test multitarget"
# -Wa,-Q but since it's default we make llvm a static runtime dependency.
RDEPEND="sys-devel/binutils-config
lto? ( app-arch/xar )
- sys-devel/llvm
+ sys-devel/llvm:*
sys-libs/libcxx"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
index 26f629c41ee..853dba37052 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -35,7 +35,7 @@ IUSE="lto test multitarget"
# -Wa,-Q but since it's default we make llvm a static runtime dependency.
RDEPEND="sys-devel/binutils-config
lto? ( app-arch/xar )
- sys-devel/llvm
+ sys-devel/llvm:*
sys-libs/libcxx"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
index d5ad6ab38a9..32405f72fca 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -32,7 +32,7 @@ IUSE="lto tapi classic test"
RDEPEND="sys-devel/binutils-config
lto? ( app-arch/xar )
tapi? ( sys-libs/tapi )
- sys-devel/llvm
+ sys-devel/llvm:*
sys-libs/libcxx"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )"
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
index bf8351a7b24..781aff39edf 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -31,7 +31,7 @@ IUSE="lto tapi classic test"
RDEPEND="sys-devel/binutils-config
lto? ( app-arch/xar )
tapi? ( sys-libs/tapi )
- sys-devel/llvm
+ sys-devel/llvm:*
sys-libs/libcxx"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )"
@@ -200,7 +200,7 @@ compile_ld64() {
LTO_INCDIR=${LLVM_INCDIR} \
LTO_LIBDIR=${LLVM_LIBDIR} \
TAPI=$(use tapi && echo 1 || echo 0) \
- TAPI_LIBDIR=${EPREFIX}/usr/lib \
+ TAPI_LIBDIR="${EPREFIX}"/usr/lib \
|| die "emake failed for ld64"
use test && emake build_test
}
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild
index 9cf67823890..11fae811996 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -32,7 +32,7 @@ IUSE="lto tapi classic test"
RDEPEND="sys-devel/binutils-config
lto? ( app-arch/xar )
tapi? ( sys-libs/tapi )
- sys-devel/llvm
+ sys-devel/llvm:*
sys-libs/libcxx"
DEPEND="${RDEPEND}
test? ( >=dev-lang/perl-5.8.8 )"