Skip to content

Commit

Permalink
Rebuild for libboost 1.82 (#190)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Oct 3, 2023
2 parents adce3b3 + fd4aabb commit 9839801
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 24 deletions.
6 changes: 2 additions & 4 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
assimp:
- 5.3.1
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
Expand Down Expand Up @@ -30,6 +28,8 @@ libabseil:
- '20230802'
libblas:
- 3.9 *netlib
libboost_devel:
- '1.82'
libcblas:
- 3.9 *netlib
libcurl:
Expand All @@ -43,8 +43,6 @@ libuuid:
libxcb:
- '1.15'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
graphviz:
max_pin: x
qt_main:
Expand Down
6 changes: 2 additions & 4 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ BUILD:
- aarch64-conda_cos7-linux-gnu
assimp:
- 5.3.1
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
Expand Down Expand Up @@ -34,6 +32,8 @@ libabseil:
- '20230802'
libblas:
- 3.9 *netlib
libboost_devel:
- '1.82'
libcblas:
- 3.9 *netlib
libcurl:
Expand All @@ -47,8 +47,6 @@ libuuid:
libxcb:
- '1.15'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
graphviz:
max_pin: x
qt_main:
Expand Down
20 changes: 20 additions & 0 deletions .ci_support/migrations/boost_cpp_to_libboost.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
migrator_ts: 1695775149
__migrator:
kind: version
migration_number: 1
bump_number: 1
commit_message: "Rebuild for libboost 1.82"
# limit the number of prs for ramp-up
pr_limit: 10
libboost_devel:
- 1.82
# This migration is matched with a piggy-back migrator
# (see https://github.com/regro/cf-scripts/pull/1668)
# that will replace boost-cpp with libboost-devel
boost_cpp:
- 1.82
# same for boost -> libboost-python-devel
libboost_python_devel:
- 1.82
boost:
- 1.82
6 changes: 2 additions & 4 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ MACOSX_DEPLOYMENT_TARGET:
- '10.15'
assimp:
- 5.3.1
boost_cpp:
- 1.78.0
bzip2:
- '1'
c_compiler:
Expand All @@ -30,6 +28,8 @@ libabseil:
- '20230802'
libblas:
- 3.9 *netlib
libboost_devel:
- '1.82'
libcblas:
- 3.9 *netlib
libcurl:
Expand All @@ -45,8 +45,6 @@ macos_machine:
macos_min_version:
- '10.15'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
graphviz:
max_pin: x
qt_main:
Expand Down
6 changes: 2 additions & 4 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ MACOSX_DEPLOYMENT_TARGET:
- '11.0'
assimp:
- 5.3.1
boost_cpp:
- 1.78.0
bzip2:
- '1'
c_compiler:
Expand All @@ -30,6 +28,8 @@ libabseil:
- '20230802'
libblas:
- 3.9 *netlib
libboost_devel:
- '1.82'
libcblas:
- 3.9 *netlib
libcurl:
Expand All @@ -43,8 +43,6 @@ libxcb:
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
graphviz:
max_pin: x
qt_main:
Expand Down
6 changes: 2 additions & 4 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
assimp:
- 5.3.1
boost_cpp:
- 1.78.0
c_compiler:
- vs2019
channel_sources:
Expand All @@ -22,6 +20,8 @@ libabseil:
- '20230802'
libblas:
- 3.9 *netlib
libboost_devel:
- '1.82'
libcblas:
- 3.9 *netlib
libcurl:
Expand All @@ -31,8 +31,6 @@ libgdal:
libprotobuf:
- 4.23.4
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
graphviz:
max_pin: x
qt_main:
Expand Down
7 changes: 3 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ source:
- 3347.patch

build:
number: 9
number: 10
run_exports:
- {{ pin_subpackage('gazebo', max_pin='x') }}

Expand Down Expand Up @@ -58,7 +58,7 @@ requirements:
- tinyxml2 # [build_platform != target_platform]
- libtar # [build_platform != target_platform]
- libccd-double # [build_platform != target_platform]
- boost-cpp # [build_platform != target_platform]
- libboost-devel # [build_platform != target_platform]
host:
- xorg-libxext # [unix]
- xorg-libxdmcp # [unix]
Expand Down Expand Up @@ -91,7 +91,7 @@ requirements:
- libtar # [unix]
- libccd-double
- dlfcn-win32 # [win]
- boost-cpp
- libboost-devel
# additional deps
- libuuid # [linux]
- libcurl
Expand Down Expand Up @@ -128,7 +128,6 @@ requirements:
- xorg-libsm # [unix]
- libglu # [linux]
# deps
- boost-cpp
- tbb-devel
# Add constraint to avoid that old ogre gets installed during migratons,
# see https://github.com/conda-forge/gazebo-feedstock/pull/188/files
Expand Down

0 comments on commit 9839801

Please sign in to comment.