[libccd] build on platforms without valgrind

Dan Horák sharkcz at fedoraproject.org
Wed Jan 9 17:43:43 UTC 2013


commit bdd26adfcd8ae4fb900e92ce562c7cc45263dcf7
Author: Dan Horák <dan at danny.cz>
Date:   Wed Jan 9 18:43:38 2013 +0100

    build on platforms without valgrind

 libccd.spec |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/libccd.spec b/libccd.spec
index da9d392..682cb85 100644
--- a/libccd.spec
+++ b/libccd.spec
@@ -1,6 +1,10 @@
+%ifarch %{ix86} x86_64 ppc ppc64 s390x %{arm}
+%global with_valgrind 1
+%endif
+
 Name:           libccd
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for collision detection between convex shapes
 
 License:        BSD
@@ -21,7 +25,9 @@ BuildRequires:  cmake
 %endif
 # These are required for executing the test suite
 BuildRequires:  python
+%if 0%{?with_valgrind}
 BuildRequires:  valgrind
+%endif
 
 %description
 libccd implements variation on Gilbert-Johnson-Keerthi (GJK) algorithm + 
@@ -64,7 +70,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %check
+%if 0%{?with_valgrind}
 make -C build test
+%endif
 
 %post -p /sbin/ldconfig
 
@@ -82,6 +90,9 @@ make -C build test
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jan 09 2013 Dan Horák <dan[at]danny.cz> - 1.4-2
+- build on platforms without valgrind
+
 * Mon Oct 22 2012 Rich Mattes <richmattes at gmail.com> - 1.4-1
 - Update to release 1.4
 


More information about the scm-commits mailing list