Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Oct 2025 13:46:38 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 15f6d1e00fae - 2025Q4 - devel/onetbb: fix build on armv7
Message-ID:  <202510051346.595DkcZg032999@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch 2025Q4 has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=15f6d1e00faefeaef38a54111fca47469bf02ae1

commit 15f6d1e00faefeaef38a54111fca47469bf02ae1
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2025-10-03 12:21:03 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2025-10-05 13:46:27 +0000

    devel/onetbb: fix build on armv7
    
    error: option 'cf-protection=return' cannot be specified on this target
    error: option 'cf-protection=branch' cannot be specified on this target
    
    Same fix as for powerpc.
    
    Approved by:    portmgr (build fix blanket)
    MFH:            2025Q4
    
    (cherry picked from commit a1137c10faf7a0ba93fce9f87df89af8601f359b)
---
 devel/onetbb/files/patch-cmake_compilers_Clang.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devel/onetbb/files/patch-cmake_compilers_Clang.cmake b/devel/onetbb/files/patch-cmake_compilers_Clang.cmake
index d0b891075a28..5b5465e62799 100644
--- a/devel/onetbb/files/patch-cmake_compilers_Clang.cmake
+++ b/devel/onetbb/files/patch-cmake_compilers_Clang.cmake
@@ -5,7 +5,7 @@
  set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security -fPIC $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:-fstack-protector-strong>)
  
 -if (NOT APPLE AND NOT ANDROID_PLATFORM AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
-+if (NOT APPLE AND NOT ANDROID_PLATFORM AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc")
++if (NOT APPLE AND NOT ANDROID_PLATFORM AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
      set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} -fstack-clash-protection $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:-fcf-protection=full>)
  endif()
  


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510051346.595DkcZg032999>