commit:     90086b35b98db16492aff36bae392ffafc64f66b
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  2 21:02:31 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Nov  2 21:03:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90086b35

dev-lang/rust: adjust QA_EXECSTACK variable again

Bug: https://bugs.gentoo.org/806466
Closes: https://bugs.gentoo.org/819402
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-lang/rust/rust-1.52.1.ebuild    | 3 +--
 dev-lang/rust/rust-1.53.0.ebuild    | 3 +--
 dev-lang/rust/rust-1.54.0.ebuild    | 3 +--
 dev-lang/rust/rust-1.55.0.ebuild    | 3 +--
 dev-lang/rust/rust-1.56.0-r1.ebuild | 3 +--
 dev-lang/rust/rust-1.56.1.ebuild    | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/dev-lang/rust/rust-1.52.1.ebuild b/dev-lang/rust/rust-1.52.1.ebuild
index 30db42404e6..9957b7ceb23 100644
--- a/dev-lang/rust/rust-1.52.1.ebuild
+++ b/dev-lang/rust/rust-1.52.1.ebuild
@@ -141,8 +141,7 @@ QA_SONAME="
 # An rmeta file is custom binary format that contains the metadata for the 
crate.
 # rmeta files do not support linking, since they do not contain compiled 
object files.
 # so we can safely silence the warning for this QA check.
-QA_WX_LOAD="usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/.*:lib.rmeta"
-QA_EXECSTACK="${QA_WX_LOAD}"
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 # causes double bootstrap
 RESTRICT="test"

diff --git a/dev-lang/rust/rust-1.53.0.ebuild b/dev-lang/rust/rust-1.53.0.ebuild
index aeb7bd1f11c..fa79d5221f5 100644
--- a/dev-lang/rust/rust-1.53.0.ebuild
+++ b/dev-lang/rust/rust-1.53.0.ebuild
@@ -143,8 +143,7 @@ QA_SONAME="
 # An rmeta file is custom binary format that contains the metadata for the 
crate.
 # rmeta files do not support linking, since they do not contain compiled 
object files.
 # so we can safely silence the warning for this QA check.
-QA_WX_LOAD="usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/.*:lib.rmeta"
-QA_EXECSTACK="${QA_WX_LOAD}"
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 # causes double bootstrap
 RESTRICT="test"

diff --git a/dev-lang/rust/rust-1.54.0.ebuild b/dev-lang/rust/rust-1.54.0.ebuild
index 0b2c51587d6..0d1daa9be3c 100644
--- a/dev-lang/rust/rust-1.54.0.ebuild
+++ b/dev-lang/rust/rust-1.54.0.ebuild
@@ -143,8 +143,7 @@ QA_SONAME="
 # An rmeta file is custom binary format that contains the metadata for the 
crate.
 # rmeta files do not support linking, since they do not contain compiled 
object files.
 # so we can safely silence the warning for this QA check.
-QA_WX_LOAD="usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/.*:lib.rmeta"
-QA_EXECSTACK="${QA_WX_LOAD}"
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 # causes double bootstrap
 RESTRICT="test"

diff --git a/dev-lang/rust/rust-1.55.0.ebuild b/dev-lang/rust/rust-1.55.0.ebuild
index 366d1e5149b..99d6951548d 100644
--- a/dev-lang/rust/rust-1.55.0.ebuild
+++ b/dev-lang/rust/rust-1.55.0.ebuild
@@ -143,8 +143,7 @@ QA_SONAME="
 # An rmeta file is custom binary format that contains the metadata for the 
crate.
 # rmeta files do not support linking, since they do not contain compiled 
object files.
 # so we can safely silence the warning for this QA check.
-QA_WX_LOAD="usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/.*:lib.rmeta"
-QA_EXECSTACK="${QA_WX_LOAD}"
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 # causes double bootstrap
 RESTRICT="test"

diff --git a/dev-lang/rust/rust-1.56.0-r1.ebuild 
b/dev-lang/rust/rust-1.56.0-r1.ebuild
index a388d0a0069..b12ed45601f 100644
--- a/dev-lang/rust/rust-1.56.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.56.0-r1.ebuild
@@ -143,8 +143,7 @@ QA_SONAME="
 # An rmeta file is custom binary format that contains the metadata for the 
crate.
 # rmeta files do not support linking, since they do not contain compiled 
object files.
 # so we can safely silence the warning for this QA check.
-QA_WX_LOAD="usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/.*:lib.rmeta"
-QA_EXECSTACK="${QA_WX_LOAD}"
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 # causes double bootstrap
 RESTRICT="test"

diff --git a/dev-lang/rust/rust-1.56.1.ebuild b/dev-lang/rust/rust-1.56.1.ebuild
index 59c50dac02d..690bbad1807 100644
--- a/dev-lang/rust/rust-1.56.1.ebuild
+++ b/dev-lang/rust/rust-1.56.1.ebuild
@@ -143,8 +143,7 @@ QA_SONAME="
 # An rmeta file is custom binary format that contains the metadata for the 
crate.
 # rmeta files do not support linking, since they do not contain compiled 
object files.
 # so we can safely silence the warning for this QA check.
-QA_WX_LOAD="usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/.*rmeta"
-QA_EXECSTACK="${QA_WX_LOAD}"
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
 # causes double bootstrap
 RESTRICT="test"

Reply via email to