vanhofen
3 years ago
2 changed files with 68 additions and 2 deletions
@ -0,0 +1,66 @@ |
|||
From 7fe1b8a53cc8c865c2a10dcd8f6cb4e51ccc6300 Mon Sep 17 00:00:00 2001 |
|||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
|||
Date: Mon, 29 Jul 2019 12:19:10 +0200 |
|||
Subject: [PATCH] configure.ac: add an option to disable tests |
|||
|
|||
Add an option to allow the user to disable tests, this can be useful for |
|||
example when the toolchain does not provide thread. Indeed, in this |
|||
case, libgcrypt fails to build t-lock: |
|||
|
|||
t-lock.c: In function 'run_test': |
|||
t-lock.c:359:3: error: unknown type name 'pthread_t' |
|||
pthread_t rthread; |
|||
|
|||
Fixes: |
|||
- http://autobuild.buildroot.org/results/50a8ba572e3fafd3c6a39bd54bcfcaf78b5ad325 |
|||
|
|||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
|||
---
|
|||
Makefile.am | 7 ++++++- |
|||
configure.ac | 10 ++++++++++ |
|||
2 files changed, 16 insertions(+), 1 deletion(-) |
|||
|
|||
diff --git a/Makefile.am b/Makefile.am
|
|||
index 7fa4fa4d..f0bd90e4 100644
|
|||
--- a/Makefile.am
|
|||
+++ b/Makefile.am
|
|||
@@ -40,9 +40,14 @@ else
|
|||
doc = |
|||
endif |
|||
|
|||
+if BUILD_TESTS
|
|||
+tests = tests
|
|||
+else
|
|||
+tests =
|
|||
+endif
|
|||
|
|||
DIST_SUBDIRS = m4 compat mpi cipher random src doc tests |
|||
-SUBDIRS = compat mpi cipher random src $(doc) tests
|
|||
+SUBDIRS = compat mpi cipher random src $(doc) $(tests)
|
|||
|
|||
EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES \ |
|||
ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011 \ |
|||
diff --git a/configure.ac b/configure.ac
|
|||
index e8c8cd39..1a6b61e5 100644
|
|||
--- a/configure.ac
|
|||
+++ b/configure.ac
|
|||
@@ -3231,6 +3231,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc],
|
|||
AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno]) |
|||
|
|||
|
|||
+#
|
|||
+# Option to disable building of tests
|
|||
+#
|
|||
+build_tests=yes
|
|||
+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],
|
|||
+ [do not build tests]),
|
|||
+ build_tests=$enableval, build_tests=yes)
|
|||
+AM_CONDITIONAL([BUILD_TESTS], [test "x$build_tests" != xno])
|
|||
+
|
|||
+
|
|||
# |
|||
# Provide information about the build. |
|||
# |
|||
--
|
|||
2.20.1 |
|||
|
Loading…
Reference in new issue