Skip to content

Commit

Permalink
Revert "Fix build with o2 defaults on slc9 (#5353)"
Browse files Browse the repository at this point in the history
This reverts commit 5becd91.
  • Loading branch information
vascobarroso committed Feb 27, 2024
1 parent 155f1e4 commit d81fd4e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 28 deletions.
1 change: 1 addition & 0 deletions datadistribution.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ requires:
- protobuf
- O2
- fmt
- "ucx:(slc8|slc9)"
build_requires:
- CMake
source: https://github.com/AliceO2Group/DataDistribution
Expand Down
14 changes: 0 additions & 14 deletions defaults-o2-dataflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,6 @@ overrides:
BUILD_ANALYSIS: "OFF" # Disable analysis in O2
BUILD_EXAMPLES: "OFF" # Disable examples in O2
O2_BUILD_FOR_FLP: "ON"
DataDistribution:
requires:
- "GCC-Toolchain:(?!osx)"
- boost
- FairLogger
- libInfoLogger
- FairMQ
- Ppconsul
- grpc
- Monitoring
- protobuf
- O2
- fmt
- ucx # this one added
---
# This file is included in any build recipe and it's only used to set
# environment variables. Which file to actually include can be defined by the
Expand Down
14 changes: 0 additions & 14 deletions defaults-o2-epn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,6 @@ overrides:
requires:
- lhapdf
- boost
DataDistribution:
requires:
- "GCC-Toolchain:(?!osx)"
- boost
- FairLogger
- libInfoLogger
- FairMQ
- Ppconsul
- grpc
- Monitoring
- protobuf
- O2
- fmt
- ucx # this one added
---
# This file is included in any build recipe and it's only used to set
# environment variables. Which file to actually include can be defined by the
Expand Down

0 comments on commit d81fd4e

Please sign in to comment.