diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2021-10-01 14:59:21 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2021-10-01 15:41:12 -0400 |
| commit | 234f7d10f49f8f60a400d808cdbf1f28ebb3b7d7 (patch) | |
| tree | ea57a66d393677496f627bf423277925ff428190 | |
| parent | sys-libs/zlib: fix .a and .la removal logic (diff) | |
| download | gentoo-234f7d10.tar.gz gentoo-234f7d10.tar.bz2 gentoo-234f7d10.zip | |
dev-util/meson: fix testing with rust 1.55
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | dev-util/meson/files/meson-tests-rust-add-libm.patch | 22 | ||||
| -rw-r--r-- | dev-util/meson/meson-0.59.1-r1.ebuild | 1 |
2 files changed, 23 insertions, 0 deletions
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 000000000000..45803976bb9b --- /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 a7a64972a732..b11b19c5d08d 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() { |