Merge pull request #201 from regro-cf-autotick-bot/rebuild-libprotobu…

…f4251-0-1_h1907a1 Rebuild for libprotobuf 4.25.1
conda-forge · Feb 6, 2024 · 1600a75 · 1600a75
2 parents a00a1d7 + 6ef6fda
commit 1600a75
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 73 deletions.
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -39,7 +39,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 libuuid:
 - '2'
 libxcb:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -43,7 +43,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 libuuid:
 - '2'
 libxcb:

diff --git a/.ci_support/migrations/libprotobuf4251.yaml b/.ci_support/migrations/libprotobuf4251.yaml
@@ -0,0 +1,10 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for libprotobuf 4.25.1
+  kind: version
+  migration_number: 1
+libgrpc:
+- "1.60"
+libprotobuf:
+- 4.25.1
+migrator_ts: 1705841975.2201185
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -39,7 +39,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 libxcb:
 - '1.15'
 macos_machine:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -39,7 +39,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 libxcb:
 - '1.15'
 macos_machine:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -29,7 +29,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 pin_run_as_build:
   graphviz:
     max_pin: x

diff --git a/.gitignore b/.gitignore
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -29,12 +29,6 @@ fi
 mkdir build
 cd build
 
-# Workaround for https://github.com/conda-forge/gazebo-feedstock/pull/150
-# Remove when boost is updated to 1.80.0
-if [[ "${target_platform}" == "osx-64" ]]; then
-  export CXXFLAGS="-DBOOST_ASIO_DISABLE_STD_ALIGNED_ALLOC ${CXXFLAGS}"
-fi
-
 if [[ "${CONDA_BUILD_CROSS_COMPILATION}" == "1" ]]; then
   export CMAKE_ARGS="${CMAKE_ARGS} -DFREEIMAGE_RUNS:BOOL=ON -DFREEIMAGE_RUNS__TRYRUN_OUTPUT:STRING="" -DFREEIMAGE_COMPILES:BOOL=ON -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc -DPROTOBUF_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc -DGAZEBOMSGS_OUT_EXECUTABLE:STRING=`pwd`/../build-host/gazebo/msgs/gazebomsgs_out"
 fi

diff --git a/recipe/fix_build.patch b/recipe/fix_build.patch
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -13,7 +13,7 @@ source:
       - fix-invisible-meshes.patch
 
 build:
-  number: 6
+  number: 7
   run_exports:
     - {{ pin_subpackage('gazebo', max_pin='x') }}