diff --git a/tbb.changes b/tbb.changes index 7543858..2834530 100644 --- a/tbb.changes +++ b/tbb.changes @@ -1,9 +1,18 @@ +------------------------------------------------------------------- +Tue Aug 1 19:25:15 UTC 2023 - Martin Liška + +* Add use-FORTIFY_SOURCE-from-distribution.patch and use FS settings from distribution +(we use either =2 or =3). + ------------------------------------------------------------------- Tue Aug 1 01:27:35 UTC 2023 - Alessandro de Oliveira Faria - Update to 2021.10.0: - * Since C++17, parallel algorithms and Flow Graph nodes are allowed to accept pointers to the member functions and member objects as the user-provided callables. - * Added missed member functions, such as assignment operators and swap function, to the concurrent_queue and concurrent_bounded_queue containers. + * Since C++17, parallel algorithms and Flow Graph nodes are allowed to accept + pointers to the member functions and member objects as the user-provided + callables. + * Added missed member functions, such as assignment operators and swap function, + to the concurrent_queue and concurrent_bounded_queue containers. ------------------------------------------------------------------- Thu Jun 15 08:34:01 UTC 2023 - Paolo Stivanin diff --git a/tbb.spec b/tbb.spec index 58d02da..0b80f95 100644 --- a/tbb.spec +++ b/tbb.spec @@ -52,6 +52,7 @@ Source99: tbb-rpmlintrc # PATCH-FIX-OPENSUSE cmake-remove-include-path.patch -- openCV include error Patch2: cmake-remove-include-path.patch Patch4: add-cmake-check-for-libatomic-requirement-when-build.patch +Patch5: use-FORTIFY_SOURCE-from-distribution.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ diff --git a/use-FORTIFY_SOURCE-from-distribution.patch b/use-FORTIFY_SOURCE-from-distribution.patch new file mode 100644 index 0000000..54deead --- /dev/null +++ b/use-FORTIFY_SOURCE-from-distribution.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake +index b60172c..738d185 100644 +--- a/cmake/compilers/GNU.cmake ++++ b/cmake/compilers/GNU.cmake +@@ -74,7 +74,6 @@ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fno-strict-overflow -f + set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security + -fstack-protector-strong ) + set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now,-z,noexecstack) +-set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$>:-D_FORTIFY_SOURCE=2> ) + + + # TBB malloc settings