From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/files/, dev-util/meson/
Date: Fri, 1 Oct 2021 19:48:09 +0000 (UTC) [thread overview]
Message-ID: <1633117272.234f7d10f49f8f60a400d808cdbf1f28ebb3b7d7.floppym@gentoo> (raw)
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@opensuse.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() {
next reply other threads:[~2021-10-01 19:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 19:48 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-27 13:32 [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/files/, dev-util/meson/ Sam James
2023-12-06 5:42 Sam James
2023-09-24 4:13 Sam James
2023-08-17 7:42 James Le Cuirot
2022-09-11 15:09 Fabian Groffen
2021-11-26 2:29 Mike Gilbert
2020-10-11 18:16 William Hubbs
2020-02-15 20:01 William Hubbs
2020-01-14 5:18 Mike Gilbert
2019-03-04 14:57 Mike Gilbert
2019-01-26 17:41 William Hubbs
2018-09-27 15:08 Mike Gilbert
2017-01-30 17:16 William Hubbs
2016-08-06 7:05 Pacho Ramos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1633117272.234f7d10f49f8f60a400d808cdbf1f28ebb3b7d7.floppym@gentoo \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox