Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2,1/4] package/spice: disable tests
@ 2019-11-17 16:44 Fabrice Fontaine
  2019-11-17 16:44 ` [Buildroot] [PATCH v2,2/4] package/celt051: needs dynamic library Fabrice Fontaine
                   ` (4 more replies)
  0 siblings, 5 replies; 20+ messages in thread
From: Fabrice Fontaine @ 2019-11-17 16:44 UTC (permalink / raw)
  To: buildroot

By disabling tests, we'll remove the optional gdk-pixbuf dependency

Fixes:
 - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Yann E. Morin):
 - Disable tests instead of adding and fixing gdk-pixbuf optional
   dependency

 .../0001-configure.ac-add-enable-tests.patch  | 54 +++++++++++++++++++
 package/spice/spice.mk                        |  5 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 package/spice/0001-configure.ac-add-enable-tests.patch

diff --git a/package/spice/0001-configure.ac-add-enable-tests.patch b/package/spice/0001-configure.ac-add-enable-tests.patch
new file mode 100644
index 0000000000..668dea1ca3
--- /dev/null
+++ b/package/spice/0001-configure.ac-add-enable-tests.patch
@@ -0,0 +1,54 @@
+From 1b6eaf5589a14763452cbe53382cc699cdeca141 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 15 Nov 2019 11:36:14 +0100
+Subject: [PATCH] configure.ac: add --enable-tests
+
+Allow the user to disable tests through --disable-tests, this is
+especially useful for example to disable gdk-pixbuf dependency
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status:
+https://gitlab.freedesktop.org/spice/spice-common/merge_requests/6]
+---
+ Makefile.am  | 6 +++++-
+ configure.ac | 7 +++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/subprojects/spice-common/Makefile.am b/subprojects/spice-common/Makefile.am
+index 5402499..00623a1 100644
+--- a/subprojects/spice-common/Makefile.am
++++ b/subprojects/spice-common/Makefile.am
+@@ -1,7 +1,11 @@
+ NULL =
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = python_modules common tests docs
++SUBDIRS = python_modules common docs
++
++if ENABLE_TESTS
++SUBDIRS += tests
++endif
+ 
+ EXTRA_DIST =				\
+ 	meson.build			\
+diff --git a/subprojects/spice-common/configure.ac b/subprojects/spice-common/configure.ac
+index 9d10287..2dba7c8 100644
+--- a/subprojects/spice-common/configure.ac
++++ b/subprojects/spice-common/configure.ac
+@@ -33,6 +33,13 @@ AC_SEARCH_LIBS(regcomp, [regex rx])
+ SPICE_CHECK_SYSDEPS
+ SPICE_EXTRA_CHECKS
+ 
++AC_ARG_ENABLE([tests],
++  AS_HELP_STRING([--enable-tests],
++                 [Enable tests @<:@default=yes@:>@]),
++  [],
++  enable_tests="yes")
++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "xyes")
++
+ AC_ARG_ENABLE([alignment-checks],
+   AS_HELP_STRING([--enable-alignment-checks],
+                  [Enable runtime checks for cast alignment @<:@default=no@:>@]),
+-- 
+2.23.0
+
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 16e57441a8..b663479920 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -17,6 +17,8 @@ SPICE_DEPENDENCIES = \
 	openssl \
 	pixman \
 	spice-protocol
+# We're patching subprojects/spice-common/configure.ac
+SPICE_AUTORECONF = YES
 
 # We disable everything for now, because the dependency tree can become
 # quite deep if we try to enable some features, and I have not tested that.
@@ -25,7 +27,8 @@ SPICE_CONF_OPTS = \
 	--disable-opengl \
 	--disable-smartcard \
 	--without-sasl \
-	--disable-manual
+	--disable-manual \
+	--disable-tests
 
 SPICE_DEPENDENCIES += host-pkgconf
 
-- 
2.24.0

^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2020-01-27 16:25 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-17 16:44 [Buildroot] [PATCH v2,1/4] package/spice: disable tests Fabrice Fontaine
2019-11-17 16:44 ` [Buildroot] [PATCH v2,2/4] package/celt051: needs dynamic library Fabrice Fontaine
2019-11-23 13:38   ` [Buildroot] [PATCH v2, 2/4] " Peter Korsgaard
2019-11-23 16:05     ` Fabrice Fontaine
2020-01-23 22:23       ` Arnout Vandecappelle
2020-01-24 18:14         ` Yann E. MORIN
2020-01-27 16:22           ` Arnout Vandecappelle
2020-01-27 16:25             ` Fabrice Fontaine
2019-11-17 16:44 ` [Buildroot] [PATCH v2, 3/4] package/spice-protocol: bump to version 0.14.0 Fabrice Fontaine
2019-11-23 13:33   ` Peter Korsgaard
2019-12-03  9:49   ` Peter Korsgaard
2019-12-03 10:08     ` Baruch Siach
2019-12-03 12:15       ` Peter Korsgaard
2019-11-17 16:44 ` [Buildroot] [PATCH v2, 4/4] package/spice: security bump to version 0.14.2 Fabrice Fontaine
2019-11-23 13:33   ` Peter Korsgaard
2019-12-03  9:49   ` Peter Korsgaard
2019-11-18 21:47 ` [Buildroot] [PATCH v2,1/4] package/spice: disable tests Thomas Petazzoni
2019-11-19  7:47   ` Fabrice Fontaine
2019-11-19  8:15     ` Thomas Petazzoni
2019-11-22 22:14 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox