From e3d3546edab80d9d14b6caa4e4f05e57938c645b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 17 Mar 2016 19:03:15 -0400 Subject: [PATCH] gnu: libotr: Fix tests on mips64el. * gnu/packages/patches/libotr-test-auth-fix.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/messaging.scm (libotr)[source]: Add patch. --- gnu-system.am | 1 + gnu/packages/messaging.scm | 4 +++- gnu/packages/patches/libotr-test-auth-fix.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libotr-test-auth-fix.patch diff --git a/gnu-system.am b/gnu-system.am index 634093ab6e..ff53b3eb04 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -582,6 +582,7 @@ dist_patch_DATA = \ gnu/packages/patches/libevent-dns-tests.patch \ gnu/packages/patches/libmtp-devices.patch \ gnu/packages/patches/liboop-mips64-deplibs-fix.patch \ + gnu/packages/patches/libotr-test-auth-fix.patch \ gnu/packages/patches/liblxqt-include.patch \ gnu/packages/patches/libmad-armv7-thumb-pt1.patch \ gnu/packages/patches/libmad-armv7-thumb-pt2.patch \ diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index dccb6dbc34..5dc4639bb4 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -70,7 +70,9 @@ (define-public libotr version ".tar.gz")) (sha256 (base32 - "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb")))) + "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb")) + (patches + (list (search-patch "libotr-test-auth-fix.patch"))))) (build-system gnu-build-system) (propagated-inputs `(("libgcrypt" ,libgcrypt))) ; libotr headers include gcrypt.h diff --git a/gnu/packages/patches/libotr-test-auth-fix.patch b/gnu/packages/patches/libotr-test-auth-fix.patch new file mode 100644 index 0000000000..23b8d8308d --- /dev/null +++ b/gnu/packages/patches/libotr-test-auth-fix.patch @@ -0,0 +1,15 @@ +Initialize the context in 'test_auth_clear'. +Fixes the test suite on mips64el. + +Patch by Mark H Weaver + +--- libotr-4.1.1/tests/unit/test_auth.c.orig 2015-12-25 12:39:45.000000000 -0500 ++++ libotr-4.1.1/tests/unit/test_auth.c 2016-03-17 18:53:10.169999706 -0400 +@@ -67,6 +67,7 @@ + OtrlAuthInfo *auth = &ctx.auth; + + /* API call. */ ++ otrl_auth_new(&ctx); + otrl_auth_clear(auth); + + ok(auth->authstate == OTRL_AUTHSTATE_NONE &&