Skip to content

getdeps: select EL-specific manifest sections by distro_family #496

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
michel-slm wants to merge 1 commit into from
Closed

getdeps: select EL-specific manifest sections by distro_family #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 build/fbcode_builder/manifests/boost
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ icu4c
[pps]
boost

[rpms.all(distro=centos_stream,distro_vers=8)]
[rpms.all(distro_family=rhel,distro_vers=8)]
boost169
boost169-math
boost169-test
Expand Down
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/boost-python
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ icu4c
[pps]
boost

[rpms.all(distro=centos_stream,distro_vers=8)]
[rpms.all(distro_family=rhel,distro_vers=8)]
boost169
boost169-math
boost169-test
Expand Down
4 changes: 2 additions & 2 deletions build/fbcode_builder/manifests/cachelib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ xxhash
# specific configuration we rely on the folly manifest to provide this
# dependency to avoid duplication.

[rpms.all(distro=centos_stream,distro_vers=9)]
[rpms.all(distro_family=rhel,distro_vers=9)]
gcc-toolset-14

[cmake.defines.all(distro=centos_stream,distro_vers=9)]
[cmake.defines.all(distro_family=rhel,distro_vers=9)]
CMAKE_C_COMPILER=/opt/rh/gcc-toolset-14/root/usr/bin/gcc
CMAKE_CXX_COMPILER=/opt/rh/gcc-toolset-14/root/usr/bin/g++

Expand Down
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/gcc12
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[manifest]
name = gcc12

[rpms.all(distro=centos_stream,distro_vers=9)]
[rpms.all(distro_family=rhel,distro_vers=9)]
gcc-toolset-12
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/gcc14
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[manifest]
name = gcc14

[rpms.all(distro=centos_stream,distro_vers=9)]
[rpms.all(distro_family=rhel,distro_vers=9)]
gcc-toolset-14
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/libaio
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name = libaio
libaio-dev

# AlmaLinux 8 ships libaio-devel in BaseOS; centos_stream and rocky too.
[rpms.any(distro=centos_stream,distro=alma,distro=rocky,distro=fedora)]
[rpms]
libaio-devel

[download]
Expand Down
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/libaio-python
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name = libaio-python
[debs]
libaio-dev

[rpms.distro=centos_stream]
[rpms.distro_family=rhel]
libaio-devel

[download]
Expand Down
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/libmnl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ libmnl-devel

# all centos 8 distros are missing this,
# but its in fedora so may be back in a later version
[rpms.not(all(any(distro=centos_stream,distro=centos),distro_vers=8))]
[rpms.not(all(distro_family=rhel,distro_vers=8))]
libmnl-static

[debs]
Expand Down
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/lz4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ lz4
[rpms]
lz4-devel
# centos 8 and centos_stream 9 are missing this rpm
[rpms.not(any(all(distro=centos,distro_vers=8),all(distro=centos_stream,distro_vers=9)))]
[rpms.not(all(distro_family=rhel,any(distro_vers=8,distro_vers=9)))]
lz4-static

[debs]
Expand Down
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/lz4-python
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ lz4
[rpms]
lz4-devel
# centos 8 and centos_stream 9 are missing this rpm
[rpms.not(any(all(distro=centos,distro_vers=8),all(distro=centos_stream,distro_vers=9)))]
[rpms.not(all(distro_family=rhel,any(distro_vers=8,distro_vers=9)))]
lz4-static

[debs]
Expand Down
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/numa
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ sha256 = f2672a0381cb59196e9c246bf8bcc43d5568bc457700a697f1a1df762b9af884
builder = autoconf
subdir = numactl-2.0.19

[rpms.any(distro=centos_stream,distro=fedora)]
[rpms]
numactl-devel
4 changes: 2 additions & 2 deletions build/fbcode_builder/manifests/openr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ googletest
re2
range-v3

[dependencies.all(distro=centos_stream,distro_vers=9)]
[dependencies.all(distro_family=rhel,distro_vers=9)]
gcc12

[cmake.defines.all(distro=centos_stream,distro_vers=9)]
[cmake.defines.all(distro_family=rhel,distro_vers=9)]
CMAKE_C_COMPILER=/opt/rh/gcc-toolset-12/root/usr/bin/gcc
CMAKE_CXX_COMPILER=/opt/rh/gcc-toolset-12/root/usr/bin/g++

Expand Down
4 changes: 2 additions & 2 deletions build/fbcode_builder/manifests/python
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ name = python
python@3.10

# sapling needs match statements with arrive in python 3.12 in centos 10
[rpms.not(all(distro=centos_stream,distro_vers=9))]
[rpms.not(all(distro_family=rhel,distro_vers=9))]
python3
python3-devel

# Centos Stream 9 default python is 3.9, sapling needs 3.10+
[rpms.all(distro=centos_stream,distro_vers=9)]
[rpms.all(distro_family=rhel,distro_vers=9)]
python3.12
python3.12-devel

Expand Down
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/python-setuptools
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ builder = python-wheel
python3-setuptools

# Centos Stream 9 default python is 3.9, sapling needs 3.10+
[rpms.all(distro=centos_stream,distro_vers=9)]
[rpms.all(distro_family=rhel,distro_vers=9)]
python3.12-setuptools

[homebrew]
Expand Down
4 changes: 2 additions & 2 deletions build/fbcode_builder/manifests/rebalancer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ fbcode/algopt/rebalancer/oss_root = .
fbcode/algopt/rebalancer = algopt/rebalancer
fbcode/algopt/lp = algopt/lp

[dependencies.all(distro=centos_stream,distro_vers=9)]
[dependencies.all(distro_family=rhel,distro_vers=9)]
clang19

[cmake.defines.all(distro=centos_stream,distro_vers=9)]
[cmake.defines.all(distro_family=rhel,distro_vers=9)]
CMAKE_C_COMPILER=clang-19
CMAKE_CXX_COMPILER=clang++-19
4 changes: 2 additions & 2 deletions build/fbcode_builder/manifests/rebalancer-explorer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ fbcode/algopt/rebalancer = algopt/rebalancer
fbcode/algopt/lp = algopt/lp
fbcode/rebalancer/explorer = rebalancer/explorer

[dependencies.all(distro=centos_stream,distro_vers=9)]
[dependencies.all(distro_family=rhel,distro_vers=9)]
clang19

[cmake.defines.all(distro=centos_stream,distro_vers=9)]
[cmake.defines.all(distro_family=rhel,distro_vers=9)]
CMAKE_C_COMPILER=clang-19
CMAKE_CXX_COMPILER=clang++-19
Loading