Skip to content

Commit

Permalink
Rebuild for glog 0.7 (#180)
Browse files Browse the repository at this point in the history 
* Rebuild for glog 0.7

* MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.07.13.21.27

* Define `GLOG_USE_GLOG_EXPORT` as a cache entry

Signed-off-by: Julien Jerphanion <[email protected]>

---------

Signed-off-by: Julien Jerphanion <[email protected]>
Co-authored-by: Julien Jerphanion <[email protected]>
  • Loading branch information
@regro-cf-autotick-bot @jjerphan
regro-cf-autotick-bot and jjerphan authored Mar 7, 2024
1 parent 3386439 commit 9093701
Show file tree
Hide file tree
Showing 23 changed files with 33 additions and 21 deletions.
2 changes: 1 addition & 1 deletion ...e_identity_cpp1.5.1azure_storage_blobs_cpp12.9.0libevent2.1.10python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ...e_identity_cpp1.5.1azure_storage_blobs_cpp12.9.0libevent2.1.10python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ...re_identity_cpp1.5.1azure_storage_blobs_cpp12.9.0libevent2.1.10python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ...re_identity_cpp1.5.1azure_storage_blobs_cpp12.9.0libevent2.1.10python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ..._cpp_azure_identity_cpp_azure_storage_blobs_cpp_libevent2.1.12python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ..._cpp_azure_identity_cpp_azure_storage_blobs_cpp_libevent2.1.12python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ...e_cpp_azure_identity_cpp_azure_storage_blobs_cpp_libevent2.1.12python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ...e_cpp_azure_identity_cpp_azure_storage_blobs_cpp_libevent2.1.12python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/migrations/glog07.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for glog 0.7
kind: version
migration_number: 1
glog:
- '0.7'
migrator_ts: 1708266332.3422346
2 changes: 1 addition & 1 deletion ...e_identity_cpp1.5.1azure_storage_blobs_cpp12.9.0libevent2.1.10python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ...e_identity_cpp1.5.1azure_storage_blobs_cpp12.9.0libevent2.1.10python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ...re_identity_cpp1.5.1azure_storage_blobs_cpp12.9.0libevent2.1.10python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ..._cpp_azure_identity_cpp_azure_storage_blobs_cpp_libevent2.1.12python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ..._cpp_azure_identity_cpp_azure_storage_blobs_cpp_libevent2.1.12python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ...e_cpp_azure_identity_cpp_azure_storage_blobs_cpp_libevent2.1.12python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ...e_identity_cpp1.5.1azure_storage_blobs_cpp12.9.0libevent2.1.10python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ...e_identity_cpp1.5.1azure_storage_blobs_cpp12.9.0libevent2.1.10python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ...re_identity_cpp1.5.1azure_storage_blobs_cpp12.9.0libevent2.1.10python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ..._cpp_azure_identity_cpp_azure_storage_blobs_cpp_libevent2.1.12python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ..._cpp_azure_identity_cpp_azure_storage_blobs_cpp_libevent2.1.12python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion ...e_cpp_azure_identity_cpp_azure_storage_blobs_cpp_libevent2.1.12python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ folly:
gflags:
- '2.2'
glog:
- '0.6'
- '0.7'
libcurl:
- '8'
libevent:
Expand Down
4 changes: 4 additions & 0 deletions recipe/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ export ARCTICDB_USING_CONDA=1
# We build with only 1 core to prevent these freezes from happening.
export CMAKE_BUILD_PARALLEL_LEVEL=1

# Required to be able to include headers from glog since glog 0.7
# See: https://github.com/google/glog/pull/1030
export CXXFLAGS="$CXXFLAGS -DGLOG_USE_GLOG_EXPORT"

if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then
# Get an updated config.sub and config.guess
# (see https://conda-forge.org/docs/maintainer/knowledge_base.html#cross-compilation)
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ build:
# Fixing requires to rebuild the whole stack while OSX build
# for python 3.8 is not used by anyone.
skip: true # [osx and py<39]
number: 0
number: 1

entry_points:
- arcticdb_update_storage = arcticdb.scripts.update_storage:main
Expand Down

0 comments on commit 9093701

Please sign in to comment.