Add ros-jazzy-rviz-ogre-vendor.patch to fix arm64 builds on macOS.

RoboStack · Sep 14, 2024 · 3a8212d · 3a8212d
1 parent ce285c7
commit 3a8212d
Showing 1 changed file with 27 additions and 0 deletions.
diff --git a/patch/ros-jazzy-rviz-ogre-vendor.patch b/patch/ros-jazzy-rviz-ogre-vendor.patch
@@ -0,0 +1,27 @@
+diff --git a/patches/0005-fix-arm64.patch b/patches/0005-fix-arm64.patch
+new file mode 100644
+index 000000000..e4e44916c
+--- /dev/null
++++ b/patches/0005-fix-arm64.patch
+@@ -0,0 +1,20 @@
++diff --git a/CMakeLists.txt b/CMakeLists.txt
++index f4d8fd4..ffae9c8 100644
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -270,14 +270,6 @@ elseif(EMSCRIPTEN)
++   set(OGRE_CONFIG_THREADS "0" CACHE STRING "Threading is unstable on Emscripten" FORCE)
++ elseif (APPLE AND NOT APPLE_IOS)
++ 
++-  set(XCODE_ATTRIBUTE_SDKROOT macosx)
++-  if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
++-    execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT)
++-    string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
++-  else()
++-    set(CMAKE_OSX_SYSROOT macosx)
++-  endif()
++-
++   # Make sure that the OpenGL render system is selected for non-iOS Apple builds
++   set(OGRE_BUILD_RENDERSYSTEM_GLES2 FALSE)
++ endif ()
++-- 
+--