- Redefine _configure and use standard %configure macro

This commit is contained in:
Jeff Law 2020-01-17 12:06:14 -07:00
parent 2ea8664f7f
commit 1b65ba7aa6
1 changed files with 8 additions and 4 deletions

View File

@ -1,6 +1,6 @@
Name: libcircle
Version: 0.2.1
Release: 0.8rc1%{?dist}
Release: 0.9rc1%{?dist}
%global myversion 0.2.1-rc.1
Source: https://github.com/hpc/libcircle/releases/download/%{myversion}/%{name}-%{myversion}.tar.gz
@ -73,18 +73,19 @@ MPICH ibcircle
%build
mkdir openmpi mpich
%global dconfigure %(printf %%s '%configure' | sed 's!\./configure!../configure!g')
%global _configure ../configure
pushd openmpi
%{_openmpi_load}
%dconfigure --enable-doxygen --enable-tests --disable-static --libdir="${MPI_LIB}" --includedir="${MPI_INCLUDE}"
%configure --enable-doxygen --enable-tests --disable-static --libdir="${MPI_LIB}" --includedir="${MPI_INCLUDE}"
%make_build
%{_openmpi_unload}
popd
pushd mpich
%{_mpich_load}
%dconfigure --enable-tests --disable-static --libdir="${MPI_LIB}" --includedir="${MPI_INCLUDE}"
%configure --enable-tests --disable-static --libdir="${MPI_LIB}" --includedir="${MPI_INCLUDE}"
%make_build
%{_mpich_unload}
popd
@ -133,6 +134,9 @@ make -C mpich check
%{_docdir}/%{name}
%changelog
* Fri Jan 25 2020 Jeff Law <law@redhat.com> - 0.2.1-0.9rc1
- Redefine _configure and use standard %configure macro
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.1-0.8rc1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild