diff options
| author | Björn Esser <besser82@fedoraproject.org> | 2020-04-25 10:03:16 +0200 |
|---|---|---|
| committer | Björn Esser <besser82@fedoraproject.org> | 2020-04-25 10:03:16 +0200 |
| commit | e0427ce86657c067e1539f54bd18b2e6044e7c97 (patch) | |
| tree | 126f6d0f214ec1f58168c592d8d8f4b6aa4033cc /libxcrypt.spec.rpkg | |
| parent | 9f1fa9df2347a3bcd1d180bee458ace73b5092a2 (diff) | |
| download | libxcrypt-e0427ce86657c067e1539f54bd18b2e6044e7c97.tar.gz libxcrypt-e0427ce86657c067e1539f54bd18b2e6044e7c97.tar.bz2 libxcrypt-e0427ce86657c067e1539f54bd18b2e6044e7c97.zip | |
rpkg: Remove memcheck conditional.
Diffstat (limited to 'libxcrypt.spec.rpkg')
| -rw-r--r-- | libxcrypt.spec.rpkg | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/libxcrypt.spec.rpkg b/libxcrypt.spec.rpkg index 332a2f4..e8ecf88 100644 --- a/libxcrypt.spec.rpkg +++ b/libxcrypt.spec.rpkg @@ -26,19 +26,6 @@ %bcond_without staticlib -# Run memcheck? -%ifarch %{valgrind_arches} -# Valgrind does not work well on %%{power64} arches. -%ifarch %{power64} -%bcond_with memcheck -%else -%bcond_without memcheck -%endif -%else -%bcond_with memcheck -%endif - - # Shared object version of libcrypt. %if %{with new_api} %global soc 2 @@ -119,11 +106,7 @@ %else \ --disable-static \\\ %endif \ -%if %{with memcheck} \ - --enable-valgrind \\\ -%else \ --disable-valgrind \\\ -%endif \ --srcdir=$(realpath ..) \\\ --with-pkgconfigdir=%{_libdir}/pkgconfig @@ -187,9 +170,6 @@ BuildRequires: fipscheck BuildRequires: gcc BuildRequires: glibc-devel >= %{glibc_minver} BuildRequires: libtool -%if %{with memcheck} -BuildRequires: valgrind -%endif # We do not need to keep this forever. %if !(0%{?fedora} > 31 || 0%{?rhel} > 10) @@ -416,16 +396,6 @@ for dir in ${build_dirs}; do echo "-----END TESTLOG: ${dir}-----"; 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 |