From 98c44fc351d16a0d97be8604ac5c2a895867789e Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 13 Jan 2025 05:11:19 -0600 Subject: [PATCH] hep stack: root +postgres (#48498) --- share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml | 2 +- var/spack/repos/builtin/packages/postgresql/package.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml index af82400a02c..01b58a6ad67 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml @@ -51,7 +51,7 @@ spack: - py-uproot +lz4 +xrootd +zstd - pythia8 +evtgen +fastjet +hdf5 +hepmc +hepmc3 +lhapdf ~madgraph5amc +python +rivet ~root # pythia8 and root circularly depend - rivet hepmc=3 - - root +davix +dcache +examples +fftw +fits +fortran +gdml +graphviz +gsl +http +math +minuit +mlp +mysql +opengl ~postgres +pythia8 +python +r +roofit +root7 +rpath ~shadow +spectrum +sqlite +ssl +tbb +threads +tmva +unuran +vc +vdt +veccore +webgui +x +xml +xrootd + - root +davix +dcache +examples +fftw +fits +fortran +gdml +graphviz +gsl +http +math +minuit +mlp +mysql +opengl +postgres +pythia8 +python +r +roofit +root7 +rpath ~shadow +spectrum +sqlite +ssl +tbb +threads +tmva +unuran +vc +vdt +veccore +webgui +x +xml +xrootd - sherpa +analysis ~blackhat +gzip +hepmc3 +hepmc3root +lhapdf +lhole +openloops +pythia ~python ~recola ~rivet +root +ufo - thepeg ~rivet - vecgeom +gdml +geant4 +root diff --git a/var/spack/repos/builtin/packages/postgresql/package.py b/var/spack/repos/builtin/packages/postgresql/package.py index a9d68e9db39..79e1d10382b 100644 --- a/var/spack/repos/builtin/packages/postgresql/package.py +++ b/var/spack/repos/builtin/packages/postgresql/package.py @@ -65,7 +65,8 @@ class Postgresql(AutotoolsPackage): variant("xml", default=False, description="Build with XML support.") variant("icu", default=True, description="Build with ICU support.", when="@16:") - depends_on("icu4c", when="@16: +icu") + depends_on("icu4c", when="+icu") + depends_on("pkgconfig", when="+icu", type="build") depends_on("readline", when="lineedit=readline") depends_on("libedit", when="lineedit=libedit") depends_on("openssl") @@ -73,6 +74,7 @@ class Postgresql(AutotoolsPackage): depends_on("perl+opcode", when="+perl") depends_on("python", when="+python") depends_on("libxml2", when="+xml") + depends_on("pkgconfig", when="+xml", type="build") @property def command(self):