Merge pull request #178 from regro-cf-autotick-bot/rebuild-boost1840-…

…0-1_h1a9291 Rebuild for libboost 1.84
conda-forge · Mar 26, 2024 · 0d7e93b · 0d7e93b
2 parents 2f67b9c + 32384dd
commit 0d7e93b
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 14 deletions.
diff --git a/.ci_support/linux_64_folly_build_extNone.yaml b/.ci_support/linux_64_folly_build_extNone.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.7'
 libboost_devel:
-- '1.82'
+- '1.84'
 libevent:
 - 2.1.12
 lz4_c:

diff --git a/.ci_support/linux_64_folly_build_extjemalloc.yaml b/.ci_support/linux_64_folly_build_extjemalloc.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.7'
 libboost_devel:
-- '1.82'
+- '1.84'
 libevent:
 - 2.1.12
 lz4_c:

diff --git a/.ci_support/linux_aarch64_folly_build_extNone.yaml b/.ci_support/linux_aarch64_folly_build_extNone.yaml
@@ -29,7 +29,7 @@ gflags:
 glog:
 - '0.7'
 libboost_devel:
-- '1.82'
+- '1.84'
 libevent:
 - 2.1.12
 lz4_c:

diff --git a/.ci_support/linux_aarch64_folly_build_extjemalloc.yaml b/.ci_support/linux_aarch64_folly_build_extjemalloc.yaml
@@ -29,7 +29,7 @@ gflags:
 glog:
 - '0.7'
 libboost_devel:
-- '1.82'
+- '1.84'
 libevent:
 - 2.1.12
 lz4_c:

diff --git a/.ci_support/linux_ppc64le_folly_build_extNone.yaml b/.ci_support/linux_ppc64le_folly_build_extNone.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.7'
 libboost_devel:
-- '1.82'
+- '1.84'
 libevent:
 - 2.1.12
 lz4_c:

diff --git a/.ci_support/linux_ppc64le_folly_build_extjemalloc.yaml b/.ci_support/linux_ppc64le_folly_build_extjemalloc.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.7'
 libboost_devel:
-- '1.82'
+- '1.84'
 libevent:
 - 2.1.12
 lz4_c:

diff --git a/.ci_support/migrations/boost1840.yaml 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/.ci_support/osx_64_folly_build_extNone.yaml b/.ci_support/osx_64_folly_build_extNone.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.7'
 libboost_devel:
-- '1.82'
+- '1.84'
 libevent:
 - 2.1.12
 lz4_c:

diff --git a/.ci_support/osx_64_folly_build_extjemalloc.yaml b/.ci_support/osx_64_folly_build_extjemalloc.yaml
@@ -25,7 +25,7 @@ gflags:
 glog:
 - '0.7'
 libboost_devel:
-- '1.82'
+- '1.84'
 libevent:
 - 2.1.12
 lz4_c:

diff --git a/.ci_support/osx_arm64_folly_build_extNone.yaml b/.ci_support/osx_arm64_folly_build_extNone.yaml
@@ -23,7 +23,7 @@ gflags:
 glog:
 - '0.7'
 libboost_devel:
-- '1.82'
+- '1.84'
 libevent:
 - 2.1.12
 lz4_c:

diff --git a/.ci_support/osx_arm64_folly_build_extjemalloc.yaml b/.ci_support/osx_arm64_folly_build_extjemalloc.yaml
@@ -23,7 +23,7 @@ gflags:
 glog:
 - '0.7'
 libboost_devel:
-- '1.82'
+- '1.84'
 libevent:
 - 2.1.12
 lz4_c:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -17,7 +17,7 @@ gflags:
 glog:
 - '0.7'
 libboost_devel:
-- '1.82'
+- '1.84'
 libevent:
 - 2.1.12
 lz4_c:

diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,7 +1,7 @@
 bot:
-  automerge: true
   abi_migration_branches:
   - 2023.09.25.00
+  automerge: true
 build_platform:
   linux_aarch64: linux_64
   linux_ppc64le: linux_64

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,6 +1,6 @@
 MACOSX_SDK_VERSION:        # [osx and x86_64]
   - "11.0"                 # [osx and x86_64]
-MACOSX_DEPLOYMENT_TARGET:  # [osx and x86_64]
+c_stdlib_version:          # [osx and x86_64]
   - "11.0"                 # [osx and x86_64]
 folly_build_ext:
   - None

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -14,7 +14,7 @@ source:
     - 0001-Add-missing-unistd-include.patch
 
 build:
-  number: 0
+  number: 1
   string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}{{ build_ext }}
   ignore_run_exports:
     - jemalloc        # [(not osx) and (folly_build_ext is not undefined and folly_build_ext == "jemalloc")]
@@ -27,6 +27,7 @@ build:
 requirements:
   build:
     - {{ compiler('cxx') }}
+    - {{ stdlib("c") }}
     - cmake
     - ninja
   host:
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ gflags: @@
     glog:
     - '0.7'
     libboost_devel:
-    - '1.82'
+    - '1.84'
     libevent:
     - 2.1.12
     lz4_c:
@@ Expand Down @@