Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build ros-jazzy-desktop for osx and osx_arm64, with some exceptions. #4

Closed
wants to merge 2 commits into from
Closed

Build ros-jazzy-desktop for osx and osx_arm64, with some exceptions. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a8212d
Add ros-jazzy-rviz-ogre-vendor.patch to fix arm64 builds on macOS.
oursland Sep 12, 2024
42f0d62
osx, osx_arm64: Build ros-jazzy-desktop, with some exceptions.
oursland Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions patch/ros-jazzy-rviz-ogre-vendor.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ()
+--
--
20 changes: 14 additions & 6 deletions vinca_osx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,30 @@ full_rebuild: true

packages_skip_by_deps:
- cartographer
- octomap
- pcl_conversions
- pendulum_control
- rqt_common_plugins
- rttest
- tlsf
- tlsf_cpp

packages_remove_from_deps:
- cartographer
- octomap
- warehouse_ros_mongo
- pcl_conversions
- pendulum_control
- rqt_common_plugins
- rttest
- tlsf
- tlsf_cpp

skip_existing:
- https://conda.anaconda.org/robostack-jazzy/

packages_select_by_deps:
- ament_cmake_core
- ros_workspace
- ros_environment
- ros_base
# - desktop

- desktop

patch_dir: patch

20 changes: 14 additions & 6 deletions vinca_osx_arm64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,30 @@ full_rebuild: true

packages_skip_by_deps:
- cartographer
- octomap
- pcl_conversions
- pendulum_control
- rqt_common_plugins
- rttest
- tlsf
- tlsf_cpp

packages_remove_from_deps:
- cartographer
- octomap
- warehouse_ros_mongo
- pcl_conversions
- pendulum_control
- rqt_common_plugins
- rttest
- tlsf
- tlsf_cpp

skip_existing:
- https://conda.anaconda.org/robostack-jazzy/

packages_select_by_deps:
- ament_cmake_core
- ros_workspace
- ros_environment
- ros_base
# - desktop

- desktop

patch_dir: patch