| 1 |
commit: dd95a8a608afad3c00a98fcd0c88f5b031320d2e |
| 2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Wed Nov 3 18:42:49 2021 +0000 |
| 4 |
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> |
| 5 |
CommitDate: Sat Nov 6 18:17:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=dd95a8a6 |
| 7 |
|
| 8 |
dev-lang/rust: Backport gentoo changes |
| 9 |
|
| 10 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
| 11 |
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> |
| 12 |
|
| 13 |
dev-lang/rust/rust-1.52.1.ebuild | 9 +++++++-- |
| 14 |
dev-lang/rust/rust-1.53.0.ebuild | 9 +++++++-- |
| 15 |
dev-lang/rust/rust-1.54.0.ebuild | 5 +++++ |
| 16 |
dev-lang/rust/rust-1.55.0.ebuild | 5 +++++ |
| 17 |
4 files changed, 24 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-lang/rust/rust-1.52.1.ebuild b/dev-lang/rust/rust-1.52.1.ebuild |
| 20 |
index c005cd2..f1b3385 100644 |
| 21 |
--- a/dev-lang/rust/rust-1.52.1.ebuild |
| 22 |
+++ b/dev-lang/rust/rust-1.52.1.ebuild |
| 23 |
@@ -19,7 +19,7 @@ else |
| 24 |
SLOT="stable/${ABI_VER}" |
| 25 |
MY_P="rustc-${PV}" |
| 26 |
SRC="${MY_P}-src.tar.xz" |
| 27 |
- KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv ~x86" |
| 28 |
+ KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" |
| 29 |
fi |
| 30 |
|
| 31 |
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" |
| 32 |
@@ -138,10 +138,15 @@ QA_SONAME=" |
| 33 |
usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so |
| 34 |
" |
| 35 |
|
| 36 |
+# An rmeta file is custom binary format that contains the metadata for the crate. |
| 37 |
+# rmeta files do not support linking, since they do not contain compiled object files. |
| 38 |
+# so we can safely silence the warning for this QA check. |
| 39 |
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta" |
| 40 |
+ |
| 41 |
# causes double bootstrap |
| 42 |
RESTRICT="test" |
| 43 |
|
| 44 |
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" |
| 45 |
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc |
| 46 |
|
| 47 |
PATCHES=( |
| 48 |
"${FILESDIR}"/1.47.0-libressl.patch |
| 49 |
|
| 50 |
diff --git a/dev-lang/rust/rust-1.53.0.ebuild b/dev-lang/rust/rust-1.53.0.ebuild |
| 51 |
index 9766417..86e053f 100644 |
| 52 |
--- a/dev-lang/rust/rust-1.53.0.ebuild |
| 53 |
+++ b/dev-lang/rust/rust-1.53.0.ebuild |
| 54 |
@@ -19,7 +19,7 @@ else |
| 55 |
SLOT="stable/${ABI_VER}" |
| 56 |
MY_P="rustc-${PV}" |
| 57 |
SRC="${MY_P}-src.tar.xz" |
| 58 |
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86" |
| 59 |
+ KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" |
| 60 |
fi |
| 61 |
|
| 62 |
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" |
| 63 |
@@ -140,10 +140,15 @@ QA_SONAME=" |
| 64 |
usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so |
| 65 |
" |
| 66 |
|
| 67 |
+# An rmeta file is custom binary format that contains the metadata for the crate. |
| 68 |
+# rmeta files do not support linking, since they do not contain compiled object files. |
| 69 |
+# so we can safely silence the warning for this QA check. |
| 70 |
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta" |
| 71 |
+ |
| 72 |
# causes double bootstrap |
| 73 |
RESTRICT="test" |
| 74 |
|
| 75 |
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" |
| 76 |
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc |
| 77 |
|
| 78 |
PATCHES=( |
| 79 |
"${FILESDIR}"/1.47.0-libressl.patch |
| 80 |
|
| 81 |
diff --git a/dev-lang/rust/rust-1.54.0.ebuild b/dev-lang/rust/rust-1.54.0.ebuild |
| 82 |
index 5295278..c269d0a 100644 |
| 83 |
--- a/dev-lang/rust/rust-1.54.0.ebuild |
| 84 |
+++ b/dev-lang/rust/rust-1.54.0.ebuild |
| 85 |
@@ -140,6 +140,11 @@ QA_SONAME=" |
| 86 |
usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so |
| 87 |
" |
| 88 |
|
| 89 |
+# An rmeta file is custom binary format that contains the metadata for the crate. |
| 90 |
+# rmeta files do not support linking, since they do not contain compiled object files. |
| 91 |
+# so we can safely silence the warning for this QA check. |
| 92 |
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta" |
| 93 |
+ |
| 94 |
# causes double bootstrap |
| 95 |
RESTRICT="test" |
| 96 |
|
| 97 |
|
| 98 |
diff --git a/dev-lang/rust/rust-1.55.0.ebuild b/dev-lang/rust/rust-1.55.0.ebuild |
| 99 |
index b692edd..e540318 100644 |
| 100 |
--- a/dev-lang/rust/rust-1.55.0.ebuild |
| 101 |
+++ b/dev-lang/rust/rust-1.55.0.ebuild |
| 102 |
@@ -140,6 +140,11 @@ QA_SONAME=" |
| 103 |
usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so |
| 104 |
" |
| 105 |
|
| 106 |
+# An rmeta file is custom binary format that contains the metadata for the crate. |
| 107 |
+# rmeta files do not support linking, since they do not contain compiled object files. |
| 108 |
+# so we can safely silence the warning for this QA check. |
| 109 |
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta" |
| 110 |
+ |
| 111 |
# causes double bootstrap |
| 112 |
RESTRICT="test" |
Archives