| 1 |
commit: e6ace6b5dfc0a324ed2b848448acd3b1e2834847 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 1 13:00:48 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 1 13:01:32 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ace6b5 |
| 7 |
|
| 8 |
sys-libs/compiler-rt: add bootstrap workaround like for libcxx |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild | 9 +++++++-- |
| 14 |
sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild | 9 +++++++-- |
| 15 |
sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild | 9 +++++++-- |
| 16 |
sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild | 9 +++++++-- |
| 17 |
sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild | 9 +++++++-- |
| 18 |
5 files changed, 35 insertions(+), 10 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild |
| 21 |
index e7c52642928..45cc6aa7b63 100644 |
| 22 |
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild |
| 23 |
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2020 Gentoo Authors |
| 26 |
+# Copyright 1999-2021 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=7 |
| 30 |
@@ -46,7 +46,12 @@ pkg_pretend() { |
| 31 |
} |
| 32 |
|
| 33 |
pkg_setup() { |
| 34 |
- llvm_pkg_setup |
| 35 |
+ # Darwin Prefix builds do not have llvm installed yet, so rely on |
| 36 |
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead |
| 37 |
+ # of using llvm_pkg_setup. |
| 38 |
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then |
| 39 |
+ llvm_pkg_setup |
| 40 |
+ fi |
| 41 |
python-any-r1_pkg_setup |
| 42 |
} |
| 43 |
|
| 44 |
|
| 45 |
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild |
| 46 |
index e93bdde90a8..07412646ab2 100644 |
| 47 |
--- a/sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild |
| 48 |
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild |
| 49 |
@@ -1,4 +1,4 @@ |
| 50 |
-# Copyright 1999-2020 Gentoo Authors |
| 51 |
+# Copyright 1999-2021 Gentoo Authors |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
|
| 54 |
EAPI=7 |
| 55 |
@@ -48,7 +48,12 @@ pkg_pretend() { |
| 56 |
} |
| 57 |
|
| 58 |
pkg_setup() { |
| 59 |
- llvm_pkg_setup |
| 60 |
+ # Darwin Prefix builds do not have llvm installed yet, so rely on |
| 61 |
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead |
| 62 |
+ # of using llvm_pkg_setup. |
| 63 |
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then |
| 64 |
+ llvm_pkg_setup |
| 65 |
+ fi |
| 66 |
python-any-r1_pkg_setup |
| 67 |
} |
| 68 |
|
| 69 |
|
| 70 |
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild |
| 71 |
index e93bdde90a8..07412646ab2 100644 |
| 72 |
--- a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild |
| 73 |
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild |
| 74 |
@@ -1,4 +1,4 @@ |
| 75 |
-# Copyright 1999-2020 Gentoo Authors |
| 76 |
+# Copyright 1999-2021 Gentoo Authors |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
|
| 79 |
EAPI=7 |
| 80 |
@@ -48,7 +48,12 @@ pkg_pretend() { |
| 81 |
} |
| 82 |
|
| 83 |
pkg_setup() { |
| 84 |
- llvm_pkg_setup |
| 85 |
+ # Darwin Prefix builds do not have llvm installed yet, so rely on |
| 86 |
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead |
| 87 |
+ # of using llvm_pkg_setup. |
| 88 |
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then |
| 89 |
+ llvm_pkg_setup |
| 90 |
+ fi |
| 91 |
python-any-r1_pkg_setup |
| 92 |
} |
| 93 |
|
| 94 |
|
| 95 |
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild |
| 96 |
index e93bdde90a8..07412646ab2 100644 |
| 97 |
--- a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild |
| 98 |
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild |
| 99 |
@@ -1,4 +1,4 @@ |
| 100 |
-# Copyright 1999-2020 Gentoo Authors |
| 101 |
+# Copyright 1999-2021 Gentoo Authors |
| 102 |
# Distributed under the terms of the GNU General Public License v2 |
| 103 |
|
| 104 |
EAPI=7 |
| 105 |
@@ -48,7 +48,12 @@ pkg_pretend() { |
| 106 |
} |
| 107 |
|
| 108 |
pkg_setup() { |
| 109 |
- llvm_pkg_setup |
| 110 |
+ # Darwin Prefix builds do not have llvm installed yet, so rely on |
| 111 |
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead |
| 112 |
+ # of using llvm_pkg_setup. |
| 113 |
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then |
| 114 |
+ llvm_pkg_setup |
| 115 |
+ fi |
| 116 |
python-any-r1_pkg_setup |
| 117 |
} |
| 118 |
|
| 119 |
|
| 120 |
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild |
| 121 |
index e93bdde90a8..07412646ab2 100644 |
| 122 |
--- a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild |
| 123 |
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild |
| 124 |
@@ -1,4 +1,4 @@ |
| 125 |
-# Copyright 1999-2020 Gentoo Authors |
| 126 |
+# Copyright 1999-2021 Gentoo Authors |
| 127 |
# Distributed under the terms of the GNU General Public License v2 |
| 128 |
|
| 129 |
EAPI=7 |
| 130 |
@@ -48,7 +48,12 @@ pkg_pretend() { |
| 131 |
} |
| 132 |
|
| 133 |
pkg_setup() { |
| 134 |
- llvm_pkg_setup |
| 135 |
+ # Darwin Prefix builds do not have llvm installed yet, so rely on |
| 136 |
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead |
| 137 |
+ # of using llvm_pkg_setup. |
| 138 |
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then |
| 139 |
+ llvm_pkg_setup |
| 140 |
+ fi |
| 141 |
python-any-r1_pkg_setup |
| 142 |
} |
Archives