rpms/libxcrypt
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove memcheck conditional

Browse Source
This commit is contained in:
Björn Esser 2020-04-25 10:01:41 +02:00
parent 53ec422778
commit 67d80e8ebc
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libxcrypt.spec
View File

@ -26,11 +26,6 @@
%bcond_without staticlib %bcond_without staticlib
# Do not run memcheck by default.
# This is useful for development, only.
%bcond_with memcheck
# Shared object version of libcrypt. # Shared object version of libcrypt.
%if %{with new_api} %if %{with new_api}
%global soc 2 %global soc 2
@ -111,11 +106,7 @@
%else \ %else \
--disable-static \\\ --disable-static \\\
%endif \ %endif \
%if %{with memcheck} \
--enable-valgrind \\\
%else \
--disable-valgrind \\\ --disable-valgrind \\\
%endif \
--srcdir=$(realpath ..) \\\ --srcdir=$(realpath ..) \\\
--with-pkgconfigdir=%{_libdir}/pkgconfig --with-pkgconfigdir=%{_libdir}/pkgconfig
@ -183,9 +174,6 @@ BuildRequires: fipscheck
BuildRequires: gcc BuildRequires: gcc
BuildRequires: glibc-devel >= %{glibc_minver} BuildRequires: glibc-devel >= %{glibc_minver}
BuildRequires: libtool BuildRequires: libtool
%if %{with memcheck}
BuildRequires: valgrind
%endif
# We do not need to keep this forever. # We do not need to keep this forever.
%if !(0%{?fedora} > 31 || 0%{?rhel} > 10) %if !(0%{?fedora} > 31 || 0%{?rhel} > 10)
@ -412,16 +400,6 @@ for dir in ${build_dirs}; do
echo "-----END TESTLOG: ${dir}-----"; echo "-----END TESTLOG: ${dir}-----";
exit $rc; exit $rc;
} }
%if %{with memcheck}
%make_build -C ${dir} check-valgrind-memcheck || \
{
rc=$?;
echo "-----BEGIN TESTLOG: ${dir}-----";
cat ${dir}/test-suite-memcheck.log;
echo "-----END TESTLOG: ${dir}-----";
exit $rc;
}
%endif
done done