diff options
Diffstat (limited to 'meta/recipes-gnome/gtk-doc/files/conditionaltests.patch')
-rw-r--r-- | meta/recipes-gnome/gtk-doc/files/conditionaltests.patch | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch index 0c180f2605..21c2db7826 100644 --- a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch +++ b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch | |||
@@ -1,14 +1,23 @@ | |||
1 | From 78bbf185934147a69ceb4b617d424e12e70997bf Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Tue, 27 Jun 2017 21:00:58 +0100 | ||
4 | Subject: [PATCH 3/3] gtk-doc: Handle floating gtk-doc dependency | ||
5 | |||
1 | Allow the tests to be explicitly disabled to avoid floating dependnecy | 6 | Allow the tests to be explicitly disabled to avoid floating dependnecy |
2 | issues. This is not really an issue with RSS but is on previous releases. | 7 | issues. This is not really an issue with RSS but is on previous releases. |
3 | 8 | ||
4 | RP 2017/6/27 | 9 | RP 2017/6/27 |
5 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
6 | 11 | ||
7 | Index: gtk-doc-1.25/configure.ac | 12 | --- |
8 | =================================================================== | 13 | configure.ac | 10 ++++++++++ |
9 | --- gtk-doc-1.25.orig/configure.ac | 14 | 1 file changed, 10 insertions(+) |
10 | +++ gtk-doc-1.25/configure.ac | 15 | |
11 | @@ -161,6 +161,11 @@ if test "x$GCC" = "xyes"; then | 16 | diff --git a/configure.ac b/configure.ac |
17 | index 684e2d1..e5e3aab 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -146,6 +146,11 @@ if test "x$GCC" = "xyes"; then | ||
12 | fi | 21 | fi |
13 | fi | 22 | fi |
14 | 23 | ||
@@ -20,7 +29,7 @@ Index: gtk-doc-1.25/configure.ac | |||
20 | dnl if glib is available we can enable the tests | 29 | 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], | 30 | 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`" | 31 | [ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`" |
23 | @@ -171,6 +176,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 > | 32 | @@ -156,6 +161,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], |
24 | build_tests="no" | 33 | build_tests="no" |
25 | ] | 34 | ] |
26 | ) | 35 | ) |
@@ -30,5 +39,8 @@ Index: gtk-doc-1.25/configure.ac | |||
30 | +fi | 39 | +fi |
31 | + | 40 | + |
32 | AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes ) | 41 | 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 | 42 | dnl this enables the rule in test/Makefile.am |
34 | AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes) | 43 | AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes) |
44 | -- | ||
45 | 2.14.1 | ||
46 | |||