wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-02 02:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tbb: enable cf-protection only on supported targets

Browse source
This commit is contained in:
tranzystorekk 2025-07-02 12:42:07 +02:00
parent 2559d20451
commit c463afa7c1
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
srcpkgs/tbb/patches/stricter-disable-cf-protection.patch Normal file
View file

@ -0,0 +1,22 @@
From 65d46656f56200a7e89168824c4dbe4943421ff9 Mon Sep 17 00:00:00 2001
From: lmarz <main@lmarz.org>
Date: Wed, 2 Jul 2025 09:18:31 +0200
Subject: [PATCH] Only enable fcf-protection on x86 based processors (#1768)
---
cmake/compilers/GNU.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
index 4f55209142..d9eb1c4576 100644
--- a/cmake/compilers/GNU.cmake
+++ b/cmake/compilers/GNU.cmake
@@ -107,7 +107,7 @@ endif ()
set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv)
set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security
-fstack-protector-strong )
-if (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" AND NOT EMSCRIPTEN)
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)" AND NOT EMSCRIPTEN)
set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},8.0>>:-fcf-protection=full>)
endif ()
set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},8.0>>:-fstack-clash-protection>)

2
srcpkgs/tbb/template
View file

@ -1,7 +1,7 @@
# Template file for 'tbb'
pkgname=tbb
version=2022.2.0
revision=1
revision=2
build_style=cmake
configure_args="-DTBB_STRICT=OFF -DTBB_TEST=OFF"
makedepends="libgomp-devel libhwloc-devel"