[gentoo-commits] repo/gentoo:master commit in: dev-util/meson/files/, dev-util/meson/

[Mike Gilbert]

commit:     234f7d10f49f8f60a400d808cdbf1f28ebb3b7d7
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  1 18:59:21 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Oct  1 19:41:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234f7d10

dev-util/meson: fix testing with rust 1.55

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../meson/files/meson-tests-rust-add-libm.patch    | 22 ++++++++++++++++++++++
 dev-util/meson/meson-0.59.1-r1.ebuild              |  1 +
 2 files changed, 23 insertions(+)

diff --git a/dev-util/meson/files/meson-tests-rust-add-libm.patch b/dev-util/meson/files/meson-tests-rust-add-libm.patch
new file mode 100644
index 00000000000..45803976bb9
--- /dev/null
+++ b/dev-util/meson/files/meson-tests-rust-add-libm.patch
@@ -0,0 +1,22 @@
+From 7ad54cce49ce22b063e0cd56edb4b7f722dc5e8e Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@××××××××.org>
+Date: Wed, 29 Sep 2021 14:20:53 +0200
+Subject: [PATCH] tests/rust: add libm to fix build with rust 1.55
+
+Fixes #9309
+---
+ test cases/rust/5 polyglot static/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test cases/rust/5 polyglot static/meson.build b/test cases/rust/5 polyglot static/meson.build
+index de2e61bcbc3..a6e9550b6e2 100644
+--- a/test cases/rust/5 polyglot static/meson.build	
++++ b/test cases/rust/5 polyglot static/meson.build	
+@@ -2,6 +2,7 @@ project('static rust and c polyglot executable', 'c', 'rust')
+ 
+ deps = [
+   meson.get_compiler('c').find_library('dl', required: false),
++  meson.get_compiler('c').find_library('m', required: false),
+   dependency('threads'),
+ ]
+ 

diff --git a/dev-util/meson/meson-0.59.1-r1.ebuild b/dev-util/meson/meson-0.59.1-r1.ebuild
index a7a64972a73..b11b19c5d08 100644
--- a/dev-util/meson/meson-0.59.1-r1.ebuild
+++ b/dev-util/meson/meson-0.59.1-r1.ebuild
@@ -35,6 +35,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
+	"${FILESDIR}/meson-tests-rust-add-libm.patch"
 )
 
 python_prepare_all() {