commit:     9ead4cb398dedfd44a102ee379779b4170c4da52
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed Sep 21 17:16:30 2022 +0000
Commit:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Fri Sep 23 15:59:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=9ead4cb3

dev-lang/rust: Merge ::gentoo changes

Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/libressl/pull/452
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>

 dev-lang/rust/metadata.xml          | 3 +++
 dev-lang/rust/rust-1.59.0.ebuild    | 2 ++
 dev-lang/rust/rust-1.60.0.ebuild    | 2 ++
 dev-lang/rust/rust-1.61.0-r2.ebuild | 2 ++
 dev-lang/rust/rust-1.62.0.ebuild    | 2 ++
 dev-lang/rust/rust-1.62.1.ebuild    | 4 +++-
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 7219757..99bf905 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -23,4 +23,7 @@
                <flag name="system-llvm">Use the system LLVM installation</flag>
                <flag name="wasm">Build support for the wasm32-unknown-unknown 
target</flag>
        </use>
+       <upstream>
+               <remote-id type="github">rust-lang/rust</remote-id>
+       </upstream>
 </pkgmetadata>

diff --git a/dev-lang/rust/rust-1.59.0.ebuild b/dev-lang/rust/rust-1.59.0.ebuild
index 33eb0ea..25e1b77 100644
--- a/dev-lang/rust/rust-1.59.0.ebuild
+++ b/dev-lang/rust/rust-1.59.0.ebuild
@@ -259,6 +259,8 @@ src_prepare() {
 }
 
 src_configure() {
+       use system-llvm && filter-flags '-flto*' # 
https://bugs.gentoo.org/862109
+
        local rust_target="" rust_targets="" arch_cflags
 
        # Collect rust target names to compile standard libs for all ABIs.

diff --git a/dev-lang/rust/rust-1.60.0.ebuild b/dev-lang/rust/rust-1.60.0.ebuild
index 75316f6..2a6ae7f 100644
--- a/dev-lang/rust/rust-1.60.0.ebuild
+++ b/dev-lang/rust/rust-1.60.0.ebuild
@@ -257,6 +257,8 @@ src_prepare() {
 }
 
 src_configure() {
+       use system-llvm && filter-flags '-flto*' # 
https://bugs.gentoo.org/862109
+
        local rust_target="" rust_targets="" arch_cflags
 
        # Collect rust target names to compile standard libs for all ABIs.

diff --git a/dev-lang/rust/rust-1.61.0-r2.ebuild 
b/dev-lang/rust/rust-1.61.0-r2.ebuild
index 3a148c1..3d909c0 100644
--- a/dev-lang/rust/rust-1.61.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.61.0-r2.ebuild
@@ -260,6 +260,8 @@ src_prepare() {
 }
 
 src_configure() {
+       use system-llvm && filter-flags '-flto*' # 
https://bugs.gentoo.org/862109
+
        local rust_target="" rust_targets="" arch_cflags use_libcxx="false"
 
        # Collect rust target names to compile standard libs for all ABIs.

diff --git a/dev-lang/rust/rust-1.62.0.ebuild b/dev-lang/rust/rust-1.62.0.ebuild
index 2fc892d..f2a0e8d 100644
--- a/dev-lang/rust/rust-1.62.0.ebuild
+++ b/dev-lang/rust/rust-1.62.0.ebuild
@@ -257,6 +257,8 @@ src_prepare() {
 }
 
 src_configure() {
+       use system-llvm && filter-flags '-flto*' # 
https://bugs.gentoo.org/862109
+
        local rust_target="" rust_targets="" arch_cflags use_libcxx="false"
 
        # Collect rust target names to compile standard libs for all ABIs.

diff --git a/dev-lang/rust/rust-1.62.1.ebuild b/dev-lang/rust/rust-1.62.1.ebuild
index 2fc892d..990093d 100644
--- a/dev-lang/rust/rust-1.62.1.ebuild
+++ b/dev-lang/rust/rust-1.62.1.ebuild
@@ -19,7 +19,7 @@ else
        SLOT="stable/${ABI_VER}"
        MY_P="rustc-${PV}"
        SRC="${MY_P}-src.tar.xz"
-       KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+       KEYWORDS="amd64 arm arm64 ppc64 ~riscv sparc x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
@@ -257,6 +257,8 @@ src_prepare() {
 }
 
 src_configure() {
+       use system-llvm && filter-flags '-flto*' # 
https://bugs.gentoo.org/862109
+
        local rust_target="" rust_targets="" arch_cflags use_libcxx="false"
 
        # Collect rust target names to compile standard libs for all ABIs.

Reply via email to