* [Buildroot] [PATCH 1/1] package/libgcrypt: disable tests
@ 2019-07-29 10:30 Fabrice Fontaine
2019-08-01 8:50 ` Peter Korsgaard
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2019-07-29 10:30 UTC (permalink / raw)
To: buildroot
Add a patch to disable tests as t-lock needs threads
Fixes:
- http://autobuild.buildroot.org/results/50a8ba572e3fafd3c6a39bd54bcfcaf78b5ad325
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...re.ac-add-an-option-to-disable-tests.patch | 66 +++++++++++++++++++
package/libgcrypt/libgcrypt.mk | 1 +
2 files changed, 67 insertions(+)
create mode 100644 package/libgcrypt/0004-configure.ac-add-an-option-to-disable-tests.patch
diff --git a/package/libgcrypt/0004-configure.ac-add-an-option-to-disable-tests.patch b/package/libgcrypt/0004-configure.ac-add-an-option-to-disable-tests.patch
new file mode 100644
index 0000000000..21ff20a473
--- /dev/null
+++ b/package/libgcrypt/0004-configure.ac-add-an-option-to-disable-tests.patch
@@ -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
+@@ -39,9 +39,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
+@@ -2710,6 +2710,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
+
diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index 2799a6fba2..e9039e50fc 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -17,6 +17,7 @@ LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config
# Patching configure.ac and Makefile.am in 0002
LIBGCRYPT_AUTORECONF = YES
LIBGCRYPT_CONF_OPTS = \
+ --disable-tests \
--with-gpg-error-prefix=$(STAGING_DIR)/usr
# Libgcrypt doesn't support assembly for coldfire
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] package/libgcrypt: disable tests
2019-07-29 10:30 [Buildroot] [PATCH 1/1] package/libgcrypt: disable tests Fabrice Fontaine
@ 2019-08-01 8:50 ` Peter Korsgaard
0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2019-08-01 8:50 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Add a patch to disable tests as t-lock needs threads
> Fixes:
> - http://autobuild.buildroot.org/results/50a8ba572e3fafd3c6a39bd54bcfcaf78b5ad325
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> ...re.ac-add-an-option-to-disable-tests.patch | 66 +++++++++++++++++++
> package/libgcrypt/libgcrypt.mk | 1 +
> 2 files changed, 67 insertions(+)
> create mode 100644 package/libgcrypt/0004-configure.ac-add-an-option-to-disable-tests.patch
> diff --git a/package/libgcrypt/0004-configure.ac-add-an-option-to-disable-tests.patch b/package/libgcrypt/0004-configure.ac-add-an-option-to-disable-tests.patch
> new file mode 100644
> index 0000000000..21ff20a473
> --- /dev/null
> +++ b/package/libgcrypt/0004-configure.ac-add-an-option-to-disable-tests.patch
> @@ -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
> +@@ -39,9 +39,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
> +@@ -2710,6 +2710,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
> +
> diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
> index 2799a6fba2..e9039e50fc 100644
> --- a/package/libgcrypt/libgcrypt.mk
> +++ b/package/libgcrypt/libgcrypt.mk
> @@ -17,6 +17,7 @@ LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config
> # Patching configure.ac and Makefile.am in 0002
I've updated this line to mention patch 0004 as well. Please don't
forget to send the patch upstream.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-08-01 8:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-29 10:30 [Buildroot] [PATCH 1/1] package/libgcrypt: disable tests Fabrice Fontaine
2019-08-01 8:50 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox