[packages/openvswitch] - disable testing atomic ops on i486
baggins
baggins at pld-linux.org
Wed Dec 4 20:42:28 CET 2013
commit f62d3774a45920840e4f340e07b22c743b4f1440
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Dec 4 20:42:13 2013 +0100
- disable testing atomic ops on i486
disable-atomic-test.patch | 21 +++++++++++++++++++++
openvswitch.spec | 4 ++++
2 files changed, 25 insertions(+)
---
diff --git a/openvswitch.spec b/openvswitch.spec
index 02c0f44..4d4fc39 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -46,6 +46,7 @@ Source7: %{pname}.init
Source10: %{pname}.service
Source11: ovsdbmonitor.desktop
Patch0: fix-man-typo.patch
+Patch1: disable-atomic-test.patch
URL: http://openvswitch.org/
BuildRequires: Zope-Interface
BuildRequires: automake
@@ -145,6 +146,9 @@ Ten pakiet zawiera moduł jądra Linuksa.
%prep
%setup -q -n %{pname}-%{version}
%patch0 -p1
+%ifarch i486
+%patch1 -p1
+%endif
cp %{SOURCE3} .
%build
diff --git a/disable-atomic-test.patch b/disable-atomic-test.patch
new file mode 100644
index 0000000..4a1cf73
--- /dev/null
+++ b/disable-atomic-test.patch
@@ -0,0 +1,21 @@
+--- openvswitch-2.0.0/tests/automake.mk~ 2013-10-16 00:50:35.000000000 +0200
++++ openvswitch-2.0.0/tests/automake.mk 2013-12-04 20:40:57.780242023 +0100
+@@ -100,7 +100,6 @@
+ tests/valgrind/ovsdb-server \
+ tests/valgrind/ovsdb-tool \
+ tests/valgrind/test-aes128 \
+- tests/valgrind/test-atomic \
+ tests/valgrind/test-bundle \
+ tests/valgrind/test-byte-order \
+ tests/valgrind/test-classifier \
+@@ -179,10 +178,6 @@
+ tests_test_aes128_SOURCES = tests/test-aes128.c
+ tests_test_aes128_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
+
+-noinst_PROGRAMS += tests/test-atomic
+-tests_test_atomic_SOURCES = tests/test-atomic.c
+-tests_test_atomic_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
+-
+ noinst_PROGRAMS += tests/test-bundle
+ tests_test_bundle_SOURCES = tests/test-bundle.c
+ tests_test_bundle_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openvswitch.git/commitdiff/f62d3774a45920840e4f340e07b22c743b4f1440
More information about the pld-cvs-commit
mailing list