Skip to content

Commit

Permalink
[getdeps] restore rpm system deps for fedora
Browse files Browse the repository at this point in the history
Summary:

centOS (even stream) tends to be quite old and thus ends up having its rpm system deps turned off, e.g. boost in D55758008 and glog and gtest in D51813855.  Unfortunate the rpm deps were removed entirely rather than limited by distro or distro_vers.

Lets renable rpm deps but specify distro=fedora to reduce the risk of people removing them entirely.

Also:
   * fedora has up to date gtest & gmock, so use them
   * zlib-ng-compat added from fedora 38 with zlib removed from F40, so update zlib rpm names.  F37 is EOL

Test Plan:

Build locally on fedora 40:
```
./build/fbcode_builder/getdeps.py install-system-deps --recursive folly
./build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. folly
```
  • Loading branch information
ahornby committed May 30, 2024
1 parent 4986fed commit b13758b
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 1 deletion.
4 changes: 4 additions & 0 deletions build/fbcode_builder/manifests/boost
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ boost169-python3
boost169-serialization
boost169-program-options

[rpms.distro=fedora]
boost-devel
boost-static

[build]
builder = boost
job_weight_mib = 512
Expand Down
3 changes: 3 additions & 0 deletions build/fbcode_builder/manifests/fmt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ subdir = fmt-9.1.0
[cmake.defines]
FMT_TEST = OFF
FMT_DOC = OFF

[rpms.distro=fedora]
fmt-devel
3 changes: 3 additions & 0 deletions build/fbcode_builder/manifests/gflags
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ BUILD_gflags_LIB = ON

[debs]
libgflags-dev

[rpms.distro=fedora]
gflags-devel
4 changes: 4 additions & 0 deletions build/fbcode_builder/manifests/glog
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ HAVE_TR1_UNORDERED_SET=OFF

[debs]
libgoogle-glog-dev

[rpms.distro=fedora]
glog-devel

4 changes: 4 additions & 0 deletions build/fbcode_builder/manifests/googletest
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@ BUILD_SHARED_LIBS=ON
[debs.not(all(distro=ubuntu,any(distro_vers="18.04",distro_vers="20.04",distro_vers="22.04")))]
libgtest-dev
libgmock-dev

[rpms.distro=fedora]
gmock-devel
gtest-devel
6 changes: 5 additions & 1 deletion build/fbcode_builder/manifests/zlib
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ zlib1g-dev
[homebrew]
zlib

[rpms]
[rpms.not(distro=fedora)]
zlib-devel
zlib-static

[rpms.distro=fedora]
zlib-ng-compat-devel
zlib-ng-compat-static

[download]
url = https://zlib.net/zlib-1.3.1.tar.gz
sha256 = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
Expand Down

0 comments on commit b13758b

Please sign in to comment.