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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E774415808E for ; Thu, 28 Apr 2022 01:26:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA706E0858; Thu, 28 Apr 2022 01:26:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1B1CE0858 for ; Thu, 28 Apr 2022 01:26:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6AA64340FED for ; Thu, 28 Apr 2022 01:26:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB59735A for ; Thu, 28 Apr 2022 01:26:44 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1651109032.5ace694ca2a1bd0f49996845f9122569fd9b6c18.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/, dev-cpp/tbb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch dev-cpp/tbb/tbb-2021.5.0-r1.ebuild X-VCS-Directories: dev-cpp/tbb/ dev-cpp/tbb/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5ace694ca2a1bd0f49996845f9122569fd9b6c18 X-VCS-Branch: master Date: Thu, 28 Apr 2022 01:26:44 +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: 5faf4cc2-e554-4b07-96df-f9c8b9eab318 X-Archives-Hash: 13bfbedba2c926e5bf21299d6e2ca669 commit: 5ace694ca2a1bd0f49996845f9122569fd9b6c18 Author: Sam James gentoo org> AuthorDate: Thu Apr 28 01:23:52 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 28 01:23:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ace694c dev-cpp/tbb: add flag stripping patch Otherwise breaks with e.g. -Werror=format-security in *FLAGS. Bug: https://github.com/oneapi-src/oneTBB/pull/716 Signed-off-by: Sam James gentoo.org> .../tbb/files/tbb-2021.5.0-flags-stripping.patch | 27 ++++++++++++++++++++++ dev-cpp/tbb/tbb-2021.5.0-r1.ebuild | 2 ++ 2 files changed, 29 insertions(+) diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch new file mode 100644 index 000000000000..4252ea446423 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch @@ -0,0 +1,27 @@ +https://github.com/oneapi-src/oneTBB/pull/716 + +From 9595b9699ae6863d1e0cf770a89728eafcaf8845 Mon Sep 17 00:00:00 2001 +From: Christoph Erhardt +Date: Wed, 5 Jan 2022 15:13:32 +0100 +Subject: [PATCH] Fix overeager stripping of compile flag + +The existing regex strips all occurrences of the given string from +`${CMAKE_CXX_FLAGS}`, regardless of whether it is just a substring of a +flag. For instance, `-Werror=format-security` gets truncated to +`=format-security`. + +The new regex makes sure that only whole words get replaced. + +Signed-off-by: Christoph Erhardt +--- a/cmake/utils.cmake ++++ b/cmake/utils.cmake +@@ -18,7 +18,7 @@ macro(tbb_remove_compile_flag flag) + set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS ${_tbb_compile_options}) + unset(_tbb_compile_options) + if (CMAKE_CXX_FLAGS) +- string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) ++ string(REGEX REPLACE "(^|[ \t\r\n]+)${flag}($|[ \t\r\n]+)" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + endif() + endmacro() + + diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild index aa3f0e7c26e2..8c4c5a5883a4 100644 --- a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild +++ b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild @@ -32,6 +32,8 @@ PATCHES=( "${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch # musl again, should be in.. 2022? "${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch + + "${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch ) src_configure() {