Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebuild for libboost 1.84 #178

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci_support/linux_64_folly_build_extNone.yaml
Original file line number Diff 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
2 changes: 1 addition & 1 deletion .ci_support/linux_64_folly_build_extjemalloc.yaml
Original file line number Diff 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
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_folly_build_extNone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ gflags:
glog:
- '0.7'
libboost_devel:
- '1.82'
- '1.84'
libevent:
- 2.1.12
lz4_c:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_folly_build_extjemalloc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ gflags:
glog:
- '0.7'
libboost_devel:
- '1.82'
- '1.84'
libevent:
- 2.1.12
lz4_c:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_folly_build_extNone.yaml
Original file line number Diff 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
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_folly_build_extjemalloc.yaml
Original file line number Diff 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
10 changes: 10 additions & 0 deletions .ci_support/migrations/boost1840.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .ci_support/osx_64_folly_build_extNone.yaml
Original file line number Diff 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
2 changes: 1 addition & 1 deletion .ci_support/osx_64_folly_build_extjemalloc.yaml
Original file line number Diff 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
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_folly_build_extNone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ gflags:
glog:
- '0.7'
libboost_devel:
- '1.82'
- '1.84'
libevent:
- 2.1.12
lz4_c:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_folly_build_extjemalloc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ gflags:
glog:
- '0.7'
libboost_devel:
- '1.82'
- '1.84'
libevent:
- 2.1.12
lz4_c:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ gflags:
glog:
- '0.7'
libboost_devel:
- '1.82'
- '1.84'
libevent:
- 2.1.12
lz4_c:
Expand Down
2 changes: 1 addition & 1 deletion conda-forge.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand All @@ -27,6 +27,7 @@ build:
requirements:
build:
- {{ compiler('cxx') }}
- {{ stdlib("c") }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Side-note: The interest reader might have a look at conda-forge/conda-forge.github.io#2102.

- cmake
- ninja
host:
Expand Down