From 9aae9a1b613b68d7a43e82915ddb804c751c40c3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 26 Mar 2024 19:41:35 +0000 Subject: [PATCH] Rebuild for libboost 1.84 --- .ci_support/migrations/boost1840.yaml | 10 ++++++++++ recipe/conda_build_config.yaml | 5 ++++- recipe/meta.yaml | 5 ++--- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 .ci_support/migrations/boost1840.yaml diff --git a/.ci_support/migrations/boost1840.yaml b/.ci_support/migrations/boost1840.yaml new file mode 100644 index 00000000..5d6e74c4 --- /dev/null +++ b/.ci_support/migrations/boost1840.yaml @@ -0,0 +1,10 @@ +__migrator: + build_number: 1 + kind: version + commit_message: "Rebuild for libboost 1.84" + migration_number: 1 +libboost_devel: +- "1.84" +libboost_python_devel: +- "1.84" +migrator_ts: 1700834511.141209 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 1ca314d2..7092e0d4 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,6 +1,6 @@ macos_min_version: # [osx and x86_64] - 10.15 # [osx and x86_64] -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +c_stdlib_version: # [osx and x86_64] - 10.15 # [osx and x86_64] c_compiler: # [win] @@ -15,3 +15,6 @@ docker_image: # [linux64] - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64] cdt_name: # [linux64] - cos7 # [linux64] + +c_stdlib_version: # [linux] + - "2.17" # [linux] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6e0825d9..4b3f409d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: - fix-invisible-meshes.patch build: - number: 9 + number: 10 run_exports: - {{ pin_subpackage('gazebo', max_pin='x') }} @@ -21,7 +21,7 @@ requirements: build: - {{ compiler('cxx') }} - {{ compiler('c') }} - - sysroot_linux-64 2.17 # [linux64 and cdt_name == 'cos7'] + - {{ stdlib("c") }} - cmake - pkg-config - ninja @@ -132,7 +132,6 @@ requirements: # see https://github.com/conda-forge/gazebo-feedstock/pull/188/files and # https://github.com/conda-forge/gazebo-feedstock/pull/203#issuecomment-1981995139 - "ogre >=1.10.12.1" - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] test: commands: