summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gtk-doc/files/conditionaltests.patch')
-rw-r--r--meta/recipes-gnome/gtk-doc/files/conditionaltests.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
new file mode 100644
index 0000000000..0c180f2605
--- /dev/null
+++ b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
@@ -0,0 +1,34 @@
1Allow the tests to be explicitly disabled to avoid floating dependnecy
2issues. This is not really an issue with RSS but is on previous releases.
3
4RP 2017/6/27
5Upstream-Status: Pending
6
7Index: gtk-doc-1.25/configure.ac
8===================================================================
9--- gtk-doc-1.25.orig/configure.ac
10+++ gtk-doc-1.25/configure.ac
11@@ -161,6 +161,11 @@ if test "x$GCC" = "xyes"; then
12 fi
13 fi
14
15+AC_ARG_ENABLE([tests],
16+ AS_HELP_STRING([--enable-tests],
17+ [enable tests (default=yes)]),,
18+ [enable_tests="yes"])
19+
20 dnl if glib is available we can enable the tests
21 PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0],
22 [ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`"
23@@ -171,6 +176,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >
24 build_tests="no"
25 ]
26 )
27+if test "x$enable_tests" != "xyes"; then
28+ gtk_doc_use_libtool="no"
29+ build_tests="no"
30+fi
31+
32 AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes )
33 dnl this enable the rule in test/Makefile.am
34 AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes)