From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB22D158018 for ; Fri, 1 Oct 2021 19:48:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 873C2E08D3; Fri, 1 Oct 2021 19:48:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 36A24E0882 for ; Fri, 1 Oct 2021 19:48:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E370F342CFD for ; Fri, 1 Oct 2021 19:48:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4895510B for ; Fri, 1 Oct 2021 19:48:09 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1633117272.234f7d10f49f8f60a400d808cdbf1f28ebb3b7d7.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/files/, dev-util/meson/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/meson/files/meson-tests-rust-add-libm.patch dev-util/meson/meson-0.59.1-r1.ebuild X-VCS-Directories: dev-util/meson/files/ dev-util/meson/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 234f7d10f49f8f60a400d808cdbf1f28ebb3b7d7 X-VCS-Branch: master Date: Fri, 1 Oct 2021 19:48:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 089d74fd-d93f-47e7-b9c1-cccd9b691bfd X-Archives-Hash: 4e4664b66001b5c425df5040665254b6 commit: 234f7d10f49f8f60a400d808cdbf1f28ebb3b7d7 Author: Mike Gilbert gentoo org> AuthorDate: Fri Oct 1 18:59:21 2021 +0000 Commit: Mike Gilbert gentoo 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 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 +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() {