diff --git a/.ci_support/linux_64_folly_build_extNone.yaml b/.ci_support/linux_64_folly_build_extNone.yaml index 6541dd1..56fef7b 100644 --- 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 index 9df6067..acfd6f1 100644 --- 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 index 4b7167f..e25e25e 100644 --- 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 index b428989..e772014 100644 --- 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 index e501672..9f26a16 100644 --- 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 index 175f4b6..74fe456 100644 --- 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 new file mode 100644 index 0000000..5d6e74c --- /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/.ci_support/osx_64_folly_build_extNone.yaml b/.ci_support/osx_64_folly_build_extNone.yaml index bf64d1a..1e6e03e 100644 --- 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 index 15a239b..78b656e 100644 --- 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 index 0abb16d..36f953c 100644 --- 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 index 8707a56..4539d6f 100644 --- 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 index ffde11e..642ed7f 100644 --- 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 index f851227..fa2f774 100644 --- 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 index 87d748d..05020bf 100644 --- 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 index af94323..aa4d795 100644 --- 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: