- Add hwloc-devel and sqlite3 to the packages that trigger a

`spack external find`.

OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=78
This commit is contained in:
Egbert Eich 2023-06-26 19:56:48 +00:00 committed by Git OBS Bridge
parent c39f179959
commit d6b78ade93
2 changed files with 12 additions and 10 deletions

View File

@ -1,6 +1,8 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 26 12:26:10 UTC 2023 - Egbert Eich <eich@suse.com> Mon Jun 26 12:26:10 UTC 2023 - Egbert Eich <eich@suse.com>
- Add hwloc-devel and sqlite3 to the packages that trigger a
`spack external find`.
- Change /usr/bin to %{_bindir}. - Change /usr/bin to %{_bindir}.
------------------------------------------------------------------- -------------------------------------------------------------------

View File

@ -39,7 +39,7 @@ ExclusiveArch: do_not_build
%define spack_trigger_recommended_compilers gcc gcc-c++ gcc-fortran %define spack_trigger_recommended_compilers gcc gcc-c++ gcc-fortran
# packages recognized by spack, but not recommended # 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 %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 case $1 in
--*) shift ;; --*) shift ;;
graph|spec|unit-test) exit 0 ;; graph|spec|unit-test) exit 0 ;;
*) exec /usr/bin/spack ${args} ;; *) exec %{_bindir}/spack ${args} ;;
esac; esac;
done done
exit 0' > $tmpdir/spack exit 0' > $tmpdir/spack
@ -231,10 +231,10 @@ compilers:
- compiler: - compiler:
spec: gcc@7.5.0 spec: gcc@7.5.0
paths: paths:
cc: /usr/bin/gcc cc: %{_bindir}/gcc
cxx: /usr/bin/g++ cxx: %{_bindir}/g++
f77: /usr/bin/gfortran f77: %{_bindir}/gfortran
fc: /usr/bin/gfortran fc: %{_bindir}/gfortran
flags: {} flags: {}
operating_system: SUSE operating_system: SUSE
target: x86_64 target: x86_64
@ -347,10 +347,10 @@ compilers:
- compiler: - compiler:
spec: gcc@GCC_FULL_VERSION spec: gcc@GCC_FULL_VERSION
paths: paths:
cc: /usr/bin/gcc-GCC_VERSION cc: %{_bindir}/gcc-GCC_VERSION
cxx: /usr/bin/g++-GCC_VERSION cxx: %{_bindir}/g++-GCC_VERSION
f77: /usr/bin/gfortran-GCC_VERSION f77: %{_bindir}/gfortran-GCC_VERSION
fc: /usr/bin/gfortran-GCC_VERSION fc: %{_bindir}/gfortran-GCC_VERSION
flags: {} flags: {}
operating_system: SUSE_VERSION operating_system: SUSE_VERSION
target: HOSTTYPE target: HOSTTYPE