| 1 |
commit: 9ead4cb398dedfd44a102ee379779b4170c4da52 |
| 2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Wed Sep 21 17:16:30 2022 +0000 |
| 4 |
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> |
| 5 |
CommitDate: Fri Sep 23 15:59:43 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=9ead4cb3 |
| 7 |
|
| 8 |
dev-lang/rust: Merge ::gentoo changes |
| 9 |
|
| 10 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
| 11 |
Closes: https://github.com/gentoo/libressl/pull/452 |
| 12 |
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> |
| 13 |
|
| 14 |
dev-lang/rust/metadata.xml | 3 +++ |
| 15 |
dev-lang/rust/rust-1.59.0.ebuild | 2 ++ |
| 16 |
dev-lang/rust/rust-1.60.0.ebuild | 2 ++ |
| 17 |
dev-lang/rust/rust-1.61.0-r2.ebuild | 2 ++ |
| 18 |
dev-lang/rust/rust-1.62.0.ebuild | 2 ++ |
| 19 |
dev-lang/rust/rust-1.62.1.ebuild | 4 +++- |
| 20 |
6 files changed, 14 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml |
| 23 |
index 7219757..99bf905 100644 |
| 24 |
--- a/dev-lang/rust/metadata.xml |
| 25 |
+++ b/dev-lang/rust/metadata.xml |
| 26 |
@@ -23,4 +23,7 @@ |
| 27 |
<flag name="system-llvm">Use the system LLVM installation</flag> |
| 28 |
<flag name="wasm">Build support for the wasm32-unknown-unknown target</flag> |
| 29 |
</use> |
| 30 |
+ <upstream> |
| 31 |
+ <remote-id type="github">rust-lang/rust</remote-id> |
| 32 |
+ </upstream> |
| 33 |
</pkgmetadata> |
| 34 |
|
| 35 |
diff --git a/dev-lang/rust/rust-1.59.0.ebuild b/dev-lang/rust/rust-1.59.0.ebuild |
| 36 |
index 33eb0ea..25e1b77 100644 |
| 37 |
--- a/dev-lang/rust/rust-1.59.0.ebuild |
| 38 |
+++ b/dev-lang/rust/rust-1.59.0.ebuild |
| 39 |
@@ -259,6 +259,8 @@ src_prepare() { |
| 40 |
} |
| 41 |
|
| 42 |
src_configure() { |
| 43 |
+ use system-llvm && filter-flags '-flto*' # https://bugs.gentoo.org/862109 |
| 44 |
+ |
| 45 |
local rust_target="" rust_targets="" arch_cflags |
| 46 |
|
| 47 |
# Collect rust target names to compile standard libs for all ABIs. |
| 48 |
|
| 49 |
diff --git a/dev-lang/rust/rust-1.60.0.ebuild b/dev-lang/rust/rust-1.60.0.ebuild |
| 50 |
index 75316f6..2a6ae7f 100644 |
| 51 |
--- a/dev-lang/rust/rust-1.60.0.ebuild |
| 52 |
+++ b/dev-lang/rust/rust-1.60.0.ebuild |
| 53 |
@@ -257,6 +257,8 @@ src_prepare() { |
| 54 |
} |
| 55 |
|
| 56 |
src_configure() { |
| 57 |
+ use system-llvm && filter-flags '-flto*' # https://bugs.gentoo.org/862109 |
| 58 |
+ |
| 59 |
local rust_target="" rust_targets="" arch_cflags |
| 60 |
|
| 61 |
# Collect rust target names to compile standard libs for all ABIs. |
| 62 |
|
| 63 |
diff --git a/dev-lang/rust/rust-1.61.0-r2.ebuild b/dev-lang/rust/rust-1.61.0-r2.ebuild |
| 64 |
index 3a148c1..3d909c0 100644 |
| 65 |
--- a/dev-lang/rust/rust-1.61.0-r2.ebuild |
| 66 |
+++ b/dev-lang/rust/rust-1.61.0-r2.ebuild |
| 67 |
@@ -260,6 +260,8 @@ src_prepare() { |
| 68 |
} |
| 69 |
|
| 70 |
src_configure() { |
| 71 |
+ use system-llvm && filter-flags '-flto*' # https://bugs.gentoo.org/862109 |
| 72 |
+ |
| 73 |
local rust_target="" rust_targets="" arch_cflags use_libcxx="false" |
| 74 |
|
| 75 |
# Collect rust target names to compile standard libs for all ABIs. |
| 76 |
|
| 77 |
diff --git a/dev-lang/rust/rust-1.62.0.ebuild b/dev-lang/rust/rust-1.62.0.ebuild |
| 78 |
index 2fc892d..f2a0e8d 100644 |
| 79 |
--- a/dev-lang/rust/rust-1.62.0.ebuild |
| 80 |
+++ b/dev-lang/rust/rust-1.62.0.ebuild |
| 81 |
@@ -257,6 +257,8 @@ src_prepare() { |
| 82 |
} |
| 83 |
|
| 84 |
src_configure() { |
| 85 |
+ use system-llvm && filter-flags '-flto*' # https://bugs.gentoo.org/862109 |
| 86 |
+ |
| 87 |
local rust_target="" rust_targets="" arch_cflags use_libcxx="false" |
| 88 |
|
| 89 |
# Collect rust target names to compile standard libs for all ABIs. |
| 90 |
|
| 91 |
diff --git a/dev-lang/rust/rust-1.62.1.ebuild b/dev-lang/rust/rust-1.62.1.ebuild |
| 92 |
index 2fc892d..990093d 100644 |
| 93 |
--- a/dev-lang/rust/rust-1.62.1.ebuild |
| 94 |
+++ b/dev-lang/rust/rust-1.62.1.ebuild |
| 95 |
@@ -19,7 +19,7 @@ else |
| 96 |
SLOT="stable/${ABI_VER}" |
| 97 |
MY_P="rustc-${PV}" |
| 98 |
SRC="${MY_P}-src.tar.xz" |
| 99 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86" |
| 100 |
+ KEYWORDS="amd64 arm arm64 ppc64 ~riscv sparc x86" |
| 101 |
fi |
| 102 |
|
| 103 |
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" |
| 104 |
@@ -257,6 +257,8 @@ src_prepare() { |
| 105 |
} |
| 106 |
|
| 107 |
src_configure() { |
| 108 |
+ use system-llvm && filter-flags '-flto*' # https://bugs.gentoo.org/862109 |
| 109 |
+ |
| 110 |
local rust_target="" rust_targets="" arch_cflags use_libcxx="false" |
| 111 |
|
| 112 |
# Collect rust target names to compile standard libs for all ABIs. |
Archives