diff --git a/spack.changes b/spack.changes index 3519920..1da5731 100644 --- a/spack.changes +++ b/spack.changes @@ -1,6 +1,8 @@ ------------------------------------------------------------------- Mon Jun 26 12:26:10 UTC 2023 - Egbert Eich +- Add hwloc-devel and sqlite3 to the packages that trigger a + `spack external find`. - Change /usr/bin to %{_bindir}. ------------------------------------------------------------------- diff --git a/spack.spec b/spack.spec index 36058d4..59580ac 100644 --- a/spack.spec +++ b/spack.spec @@ -39,7 +39,7 @@ ExclusiveArch: do_not_build %define spack_trigger_recommended_compilers gcc gcc-c++ gcc-fortran # packages recognized by spack, but not recommended -%define spack_trigger_packages ghostscript go fish fzf hugo java-11-openjdk-devel java-14-openjdk-devel java-15-openjdk-devel java-16-openjdk-devel java-1_8_0-openjdk-devel ruby openmpi1-devel openmpi2-devel openmpi3-devel openmpi4-devel openmpi1-gnu-hpc-devel openmpi2-gnu-hpc-devel openmpi3-gnu-hpc-devel openmpi4-gnu-hpc-devel mpich-gnu-hpc-devel mvapich2-devel mpich-devel +%define spack_trigger_packages ghostscript go fish fzf hwloc-devel hugo java-11-openjdk-devel java-14-openjdk-devel java-15-openjdk-devel java-16-openjdk-devel java-1_8_0-openjdk-devel ruby sqlite3 openmpi1-devel openmpi2-devel openmpi3-devel openmpi4-devel openmpi1-gnu-hpc-devel openmpi2-gnu-hpc-devel openmpi3-gnu-hpc-devel openmpi4-gnu-hpc-devel mpich-gnu-hpc-devel mvapich2-devel mpich-devel %define spack_trigger_compilers gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc7-c++ gcc8-c++ gcc9-c++ gcc10-c++ gcc11-c++ gcc12-c++ gcc7-fortran gcc8-fortran gcc9-fortran gcc10-fortran gcc11-fortran gcc12-fortran @@ -206,7 +206,7 @@ while [ -n "$1" ]; do case $1 in --*) shift ;; graph|spec|unit-test) exit 0 ;; - *) exec /usr/bin/spack ${args} ;; + *) exec %{_bindir}/spack ${args} ;; esac; done exit 0' > $tmpdir/spack @@ -231,10 +231,10 @@ compilers: - compiler: spec: gcc@7.5.0 paths: - cc: /usr/bin/gcc - cxx: /usr/bin/g++ - f77: /usr/bin/gfortran - fc: /usr/bin/gfortran + cc: %{_bindir}/gcc + cxx: %{_bindir}/g++ + f77: %{_bindir}/gfortran + fc: %{_bindir}/gfortran flags: {} operating_system: SUSE target: x86_64 @@ -347,10 +347,10 @@ compilers: - compiler: spec: gcc@GCC_FULL_VERSION paths: - cc: /usr/bin/gcc-GCC_VERSION - cxx: /usr/bin/g++-GCC_VERSION - f77: /usr/bin/gfortran-GCC_VERSION - fc: /usr/bin/gfortran-GCC_VERSION + cc: %{_bindir}/gcc-GCC_VERSION + cxx: %{_bindir}/g++-GCC_VERSION + f77: %{_bindir}/gfortran-GCC_VERSION + fc: %{_bindir}/gfortran-GCC_VERSION flags: {} operating_system: SUSE_VERSION target: HOSTTYPE