haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

tbb, add patch to fix 32bit build (#13183)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-11-04 12:02:02 +01:00
committed by GitHub
parent a3f4203a3c
commit c50e427ba6
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dev-cpp/tbb/patches/tbb-2022.3.0.patchset
View File

@@ -1,4 +1,4 @@
From 4913c75e561ec3aaff1bf4cb35b43ed818640eed Mon Sep 17 00:00:00 2001
From e5493caaa2e58613102243a7761d9e8ffafc1e10 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 2 Nov 2025 07:05:17 -0300
Subject: Fix compilation errors.
@@ -100,7 +100,7 @@ index b72e03a..7b68679 100644
2.51.0
From 49e6386f79518c43a69a2bd57d3f421b2ffe6445 Mon Sep 17 00:00:00 2001
From 3203a9574c25241a79abd1d15b46a95849596c0d Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 2 Nov 2025 07:23:03 -0300
Subject: Allow compilation on Haiku's revisions older than hrev58813.
@@ -133,7 +133,7 @@ index c4abfc6..fbb5436 100644
2.51.0
From 7ebfa2dd519d217fc06fcfad9c1da752dab7023b Mon Sep 17 00:00:00 2001
From c9c1018321c32df4a7c44ecae210f70d24b8aedd Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sat, 1 Nov 2025 14:33:07 -0300
Subject: Do not attempt to load TCM on Haiku.
@@ -165,7 +165,7 @@ index 7fa71c3..9e17336 100644
2.51.0
From 7eec43803f13fe8f786f8a19cee5ca831f4844ba Mon Sep 17 00:00:00 2001
From 707d0b647d2c3dd72e119853e0d4ef96af3a76da Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 2 Nov 2025 08:16:54 -0300
Subject: Fix build of tests.
@@ -215,7 +215,7 @@ index a8885e6..ab23428 100644
2.51.0
From 30b7f1920b369c2454eccd99dd1ee97ffbb77f20 Mon Sep 17 00:00:00 2001
From da410dc24b09a42ed9f21c67d4e66e3bef8e91f4 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 2 Nov 2025 11:35:31 -0300
Subject: Fixes around tbbbind functionality.
@@ -271,3 +271,27 @@ index 21ce239..d794c3f 100644
--
2.51.0
From 6cecc65df0a19c32679abcd673fad9b11f415161 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Tue, 4 Nov 2025 11:56:06 +0100
Subject: Fix 32bit build for -fcf-protection
Co-autored-by: Oscar Lesta <oscar.lesta@gmail.com>
diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
index d9eb1c4..736aa9a 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 (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)" AND NOT EMSCRIPTEN)
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86_64)" 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.51.0