Skip to content

Commit 9f3dd89

Browse files
gmarzotmeta-codesync[bot]
authored andcommitted
fix(build): bump glog pin past cmake_policy(VERSION 3.3) breakage
Summary: ## Problem `Docker Build AMD64` and `Docker Build Interop Client AMD64` fail at the glog configure step: ``` CMake Error at cmake/GetCacheVariables.cmake:2 (cmake_policy): Compatibility with CMake < 3.5 has been removed from CMake. ``` glog at the currently-pinned rev (v0.6.0, `b33e3bad`) uses `cmake_policy(VERSION 3.3)`. CMake 4.x dropped that compat path. Both Dockerfiles use `FROM ubuntu:latest`, which now ships CMake 4.x. GitHub-runner workflows (`ubuntu-22.04`) still ship CMake 3.22.x and are unaffected. Upgrading to glog v0.7.x is blocked because v0.7.0 raises `cmake_minimum_required` to 3.22, above getdeps' 3.20.4 floor (as the existing manifest comment notes). ## Fix Bump glog rev to `3411d58669` — the last master commit before glog v0.7.0 raised cmake_minimum. It carries the `cmake_policy(VERSION 3.16...3.27)` fix in `cmake/GetCacheVariables.cmake` and still declares `cmake_minimum_required(VERSION 3.16)`. Same approach as folly's [`build/fbcode_builder/manifests/libevent`](https://github.com/facebook/folly/blob/main/build/fbcode_builder/manifests/libevent) (master-commit pin, explicitly to avoid `CMAKE_POLICY_VERSION_MINIMUM=3.5`). X-link: facebookexperimental/moxygen#163 Reviewed By: jbeshay Differential Revision: D105388038 Pulled By: afrind fbshipit-source-id: 9473b1ad7f840e49350f7b88f0ceac796245400a
1 parent 89e6a6a commit 9f3dd89

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

  • build/fbcode_builder/manifests

build/fbcode_builder/manifests/glog

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
[manifest]
22
name = glog
33

4-
# Pinned to v0.6.0 rather than v0.7.1 because v0.7.1 raises
5-
# cmake_minimum_required to 3.22, above the CMake 3.20.4 that getdeps ships.
6-
# v0.6.0 sets cmake_minimum_required(VERSION 3.16), within getdeps' range.
4+
# Pinned to a post-v0.6.0 master commit rather than v0.7.x because v0.7.0
5+
# raises cmake_minimum_required to 3.22, above the CMake 3.20.4 that getdeps
6+
# ships. This rev (2023-10-04) is the last commit before that bump; it gains
7+
# the cmake_policy(VERSION 3.16...3.27) fix in cmake/GetCacheVariables.cmake
8+
# (required for CMake 4.x as shipped in ubuntu:latest Docker images) while
9+
# keeping cmake_minimum_required(VERSION 3.16), within getdeps' range.
710
[git]
811
repo_url = https://github.com/google/glog.git
9-
rev = b33e3bad4c46c8a6345525fd822af355e5ef9446
12+
rev = 3411d58669fe07e70335b252299432a00d1e7c6c
1013

1114
[build]
1215
builder = cmake

0 commit comments

Comments
 (0)