Skip to content

Commit

Permalink
WIP: build gazebo without vendoring.
Browse files Browse the repository at this point in the history
  • Loading branch information
oursland committed Oct 10, 2024
1 parent d753848 commit 420a27a
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 23 deletions.
13 changes: 6 additions & 7 deletions additional_recipes/ros2-distro-mutex/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ requirements:
# values here should be applied from run_exports!
# if the upstream package does not have run_exports
# please change it in the conda_build_config.yaml!
run_constraints:
- libboost 1.84.*
- libboost-devel 1.84.*
- pcl 1.14.1.*
- gazebo 11.*
- libpqxx 7.*
# run_constraints:
# - libboost 1.86.*
# - libboost-devel 1.86.*
# - pcl 1.14.1.*
# - gazebo 11.*
# - libpqxx 7.*

run_exports:
weak:
Expand All @@ -46,4 +46,3 @@ about:
extra:
recipe-maintainers:
- ros-forge

14 changes: 7 additions & 7 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
gazebo:
- '11'
libpqxx:
- 7
# gazebo:
# - '11'
# libpqxx:
# - 7
numpy:
- 1.26
ogre:
- 14.2.*
# ogre:
# - 14.2.*
libprotobuf:
- 4.25.3
protobuf:
Expand Down Expand Up @@ -39,4 +39,4 @@ c_stdlib_version:
# - 11.0 # [osx and arm64]
# - 10.14 # [osx and x86_64]
# CONDA_BUILD_SYSROOT:
# - /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk # [osx and arm64]
# - /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk # [osx and arm64]
19 changes: 10 additions & 9 deletions patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,34 +185,35 @@ gz_gui_vendor:
add_host: ["gz-gui8"]
add_run: ["gz-gui8"]
gz_launch_vendor:
add_host: ["gz-launch8"]
add_run: ["gz-launch8"]
add_host: ["gz-launch7"]
add_run: ["gz-launch7"]
gz_math_vendor:
add_host: ["gz-math7"]
add_run: ["gz-math7"]
gz_msgs_vendor:
add_host: ["gz-msgs8"]
add_run: ["gz-msgs8"]
add_host: ["gz-msgs10"]
add_run: ["gz-msgs10"]
gz_physics_vendor:
add_host: ["gz-physics7"]
add_run: ["gz-physics7"]
gz_plugin_vendor:
add_host: ["gz-plugin2"]
add_run: ["gz-plugin2"]
gz_rendering_vendor:
add_host: ["gz-rendering8"]
add_run: ["gz-rendering8"]
add_host: ["gz-rendering8", "swig"]
add_run: ["gz-rendering8", "swig"]
gz_sensors_vendor:
add_host: ["gz-sensors8"]
add_run: ["gz-sensors8"]
gz_tools_vendor:
add_host: ["gz-tools2"]
add_run: ["gz-tools2"]
gz_transport_vendor:
add_host: ["gz-transport8"]
add_run: ["gz-transport8"]
add_host: ["gz-transport13"]
add_run: ["gz-transport13"]
gz_utils_vendor:
add_build: ["vcstool"]
add_host: ["gz-utils2"]
add_run: ["gz-utils2"]
sdformat_vendor:
add_host: ["sdformat14"]
add_run: ["sdformat14"]
Expand Down
12 changes: 12 additions & 0 deletions patch/ros-jazzy-gz-cmake-vendor.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/gz-cmake-config.cmake.in b/gz-cmake-config.cmake.in
index 56d06dd..c77c0b0 100644
--- a/gz-cmake-config.cmake.in
+++ b/gz-cmake-config.cmake.in
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

+set(ENV{GZ_RELAX_VERSION_MATCH} "True")
+
find_package(@LIB_NAME@@LIB_VER_MAJOR@ ${@LIB_NAME@_FIND_VERSION} REQUIRED COMPONENTS ${@LIB_NAME@_FIND_COMPONENTS})

# Set up the core library and add it to the list of all components
2 changes: 2 additions & 0 deletions robostack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ libabsl-dev:
robostack: [libabseil]
libblas-dev:
robostack: [libblas, libcblas]
libboost:
robostack: [libboost]
libboost-chrono-dev:
robostack: [libboost-devel]
libboost-date-time:
Expand Down

0 comments on commit 420a27a

Please sign in to comment.