rpms/valgrind
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Make building of libmpi wrapper explicit.

Browse Source
This commit is contained in:
Mark Wielaard 2018-01-23 22:26:40 +01:00
parent 8e93ee51aa
commit 26ac1522aa
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
valgrind.spec
View File

@ -39,15 +39,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%endif %endif
%endif %endif
# Note s390x doesn't have an openmpi port available. # We never want the openmpi subpackage when building a software collecton.
# We never want the openmpi subpackage when building a software collecton # We always want it for fedora.
# We only want it for older rhel.
%if %{is_scl} %if %{is_scl}
%global build_openmpi 0 %global build_openmpi 0
%else %else
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le %{arm} aarch64 %if 0%{?fedora}
%global build_openmpi 1 %global build_openmpi 1
%else %endif
%global build_openmpi 0 %if 0%{?rhel}
%global build_openmpi (%rhel < 8)
%endif %endif
%endif %endif
@ -330,6 +332,10 @@ CC="gcc -B `pwd`/shared/libgcc/"
%else %else
%define mpiccpath %{!?scl:%{_libdir}}%{?scl:%{_root_libdir}}/openmpi/*/bin/mpicc %define mpiccpath %{!?scl:%{_libdir}}%{?scl:%{_root_libdir}}/openmpi/*/bin/mpicc
%endif %endif
%else
# We explicitly don't want the libmpi wrapper. So make sure that configure
# doesn't pick some random mpi compiler that happens to be installed.
%define mpiccpath /bin/false
%endif %endif
# Filter out some flags that cause lots of valgrind test failures. # Filter out some flags that cause lots of valgrind test failures.
@ -344,9 +350,7 @@ CC="gcc -B `pwd`/shared/libgcc/"
%undefine _strict_symbol_defs_build %undefine _strict_symbol_defs_build
OPTFLAGS="`echo " %{optflags} " | sed 's/ -m\(64\|3[21]\) / /g;s/ -fexceptions / /g;s/ -fstack-protector\([-a-z]*\) / / g;s/ -Wp,-D_FORTIFY_SOURCE=2 / /g;s/ -O2 / /g;s/ -mcpu=\([a-z0-9]\+\) / /g;s/^ //;s/ $//'`" OPTFLAGS="`echo " %{optflags} " | sed 's/ -m\(64\|3[21]\) / /g;s/ -fexceptions / /g;s/ -fstack-protector\([-a-z]*\) / / g;s/ -Wp,-D_FORTIFY_SOURCE=2 / /g;s/ -O2 / /g;s/ -mcpu=\([a-z0-9]\+\) / /g;s/^ //;s/ $//'`"
%configure CC="$CC" CFLAGS="$OPTFLAGS" CXXFLAGS="$OPTFLAGS" \ %configure CC="$CC" CFLAGS="$OPTFLAGS" CXXFLAGS="$OPTFLAGS" \
%if %{build_openmpi}
--with-mpicc=%{mpiccpath} \ --with-mpicc=%{mpiccpath} \
%endif
GDB=%{_bindir}/gdb GDB=%{_bindir}/gdb
make %{?_smp_mflags} make %{?_smp_mflags}
@ -537,6 +541,7 @@ echo ===============END TESTING===============
%changelog %changelog
* Tue Jan 23 2018 Mark Wielaard <mjw@fedoraproject.org> * Tue Jan 23 2018 Mark Wielaard <mjw@fedoraproject.org>
- Split valgrind-tools-devel from valgrind-devel. - Split valgrind-tools-devel from valgrind-devel.
- Make building of libmpi wrapper explicit.
* Mon Jan 22 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.13.0-14 * Mon Jan 22 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.13.0-14
- undefine _strict_symbol_defs_build. - undefine _strict_symbol_defs_build.