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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C2652158003 for ; Tue, 28 Jun 2022 19:59:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 960F1E09E9; Tue, 28 Jun 2022 19:59:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 1097AE09E9 for ; Tue, 28 Jun 2022 19:59:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C191F34136D for ; Tue, 28 Jun 2022 19:59:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 168191E for ; Tue, 28 Jun 2022 19:59:27 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1656446349.17ce27a5e6dc97311ddd178fabccea3141b1ca95.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-compute-runtime/, dev-libs/intel-compute-runtime/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild X-VCS-Directories: dev-libs/intel-compute-runtime/files/ dev-libs/intel-compute-runtime/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 17ce27a5e6dc97311ddd178fabccea3141b1ca95 X-VCS-Branch: master Date: Tue, 28 Jun 2022 19:59:27 +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: fd271a02-4524-452d-8090-b47923f5cba4 X-Archives-Hash: c544f85c09bc801fccb111c36311c8e4 commit: 17ce27a5e6dc97311ddd178fabccea3141b1ca95 Author: Randall T. Vasquez icloud com> AuthorDate: Tue Jun 28 17:06:27 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Tue Jun 28 19:59:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ce27a5 dev-libs/intel-compute-runtime: add patch to remove `-D_FORTIFY_SOURCE=2` configuration from build process Signed-off-by: Randall T. Vasquez icloud.com> Closes: https://github.com/gentoo/gentoo/pull/26119 Signed-off-by: Conrad Kostecki gentoo.org> ...-runtime-22.24.23453-remove-fortify-sources.patch | 20 ++++++++++++++++++++ .../intel-compute-runtime-22.24.23453.ebuild | 6 +++--- .../intel-compute-runtime-22.25.23529.ebuild | 6 +++--- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch new file mode 100644 index 000000000000..dc0ab96dde0c --- /dev/null +++ b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch @@ -0,0 +1,20 @@ +diff --git a/compute-runtime-22.24.23453/CMakeLists.txt b/compute-runtime-22.24.23453/CMakeLists.txt +index f227808..83075f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -702,7 +702,6 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release") + else() + if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -D_FORTIFY_SOURCE=2") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security") + else() + # gcc, g++ only +@@ -711,7 +710,6 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong") + endif() +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -D_FORTIFY_SOURCE=2") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security") + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,-z,noexecstack") + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,-z,relro") diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild index bdc8a84baf08..077189e165cf 100644 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild @@ -41,11 +41,11 @@ BDEPEND="virtual/pkgconfig" DOCS=( "README.md" "FAQ.md" ) -src_prepare() { - default +PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" ) +src_prepare() { # Remove '-Werror' from default - set -e '/Werror/d' -i CMakeLists.txt || die + sed -e '/Werror/d' -i CMakeLists.txt || die cmake_src_prepare } diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild index bdc8a84baf08..077189e165cf 100644 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild @@ -41,11 +41,11 @@ BDEPEND="virtual/pkgconfig" DOCS=( "README.md" "FAQ.md" ) -src_prepare() { - default +PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" ) +src_prepare() { # Remove '-Werror' from default - set -e '/Werror/d' -i CMakeLists.txt || die + sed -e '/Werror/d' -i CMakeLists.txt || die cmake_src_prepare }