From 53e656d79ab24514d3facc95d793f2f84a1a7515 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 10 Jun 2024 02:42:15 -0700 Subject: [PATCH] restore rpm system deps for fedora (#2231) Summary: [getdeps] restore rpm system deps for fedora 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 restore the 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 Pull Request resolved: https://github.com/facebook/folly/pull/2231 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 ``` Reviewed By: HarveyHunt Differential Revision: D58324546 Pulled By: ahornby fbshipit-source-id: a4d5e8620cf55701e19317a301db3846d60f8d4b --- build/fbcode_builder/manifests/boost | 4 ++++ build/fbcode_builder/manifests/fmt | 3 +++ build/fbcode_builder/manifests/gflags | 3 +++ build/fbcode_builder/manifests/glog | 4 ++++ build/fbcode_builder/manifests/googletest | 4 ++++ build/fbcode_builder/manifests/zlib | 6 +++++- 6 files changed, 23 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost index ecf8c6f4fcb..2900324a350 100644 --- a/build/fbcode_builder/manifests/boost +++ b/build/fbcode_builder/manifests/boost @@ -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 diff --git a/build/fbcode_builder/manifests/fmt b/build/fbcode_builder/manifests/fmt index 9bc0800e5c8..015e8c3bc3e 100644 --- a/build/fbcode_builder/manifests/fmt +++ b/build/fbcode_builder/manifests/fmt @@ -15,3 +15,6 @@ FMT_DOC = OFF [homebrew] fmt + +[rpms.distro=fedora] +fmt-devel diff --git a/build/fbcode_builder/manifests/gflags b/build/fbcode_builder/manifests/gflags index 7c26690aa90..47c01c20494 100644 --- a/build/fbcode_builder/manifests/gflags +++ b/build/fbcode_builder/manifests/gflags @@ -20,3 +20,6 @@ gflags [debs] libgflags-dev + +[rpms.distro=fedora] +gflags-devel diff --git a/build/fbcode_builder/manifests/glog b/build/fbcode_builder/manifests/glog index b72836d2c8a..b5d5fa814cc 100644 --- a/build/fbcode_builder/manifests/glog +++ b/build/fbcode_builder/manifests/glog @@ -26,3 +26,7 @@ glog [debs] libgoogle-glog-dev + +[rpms.distro=fedora] +glog-devel + diff --git a/build/fbcode_builder/manifests/googletest b/build/fbcode_builder/manifests/googletest index ffbfc233c9e..10117587450 100644 --- a/build/fbcode_builder/manifests/googletest +++ b/build/fbcode_builder/manifests/googletest @@ -24,3 +24,7 @@ googletest [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 diff --git a/build/fbcode_builder/manifests/zlib b/build/fbcode_builder/manifests/zlib index dda100aa9e3..8c52088dbfd 100644 --- a/build/fbcode_builder/manifests/zlib +++ b/build/fbcode_builder/manifests/zlib @@ -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