mirror of
https://git.yoctoproject.org/poky
synced 2026-09-13 00:49:33 +02:00
gtk-doc: upgrade 1.33.2 -> 1.34.0
Drop merged patch. (From OE-Core rev: 98ff632754a1c230623c825e187c78741a2f9d8b) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
4acc13e88a
commit
cd83165cf4
@@ -1,23 +1,22 @@
|
||||
From 78bbf185934147a69ceb4b617d424e12e70997bf Mon Sep 17 00:00:00 2001
|
||||
From 9aa9230a305e964b2417daea2b51e43b2dee607c Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Tue, 27 Jun 2017 21:00:58 +0100
|
||||
Subject: [PATCH 3/3] gtk-doc: Handle floating gtk-doc dependency
|
||||
Subject: [PATCH] gtk-doc: Handle floating gtk-doc dependency
|
||||
|
||||
Allow the tests to be explicitly disabled to avoid floating dependnecy
|
||||
issues. This is not really an issue with RSS but is on previous releases.
|
||||
|
||||
RP 2017/6/27
|
||||
Upstream-Status: Pending
|
||||
|
||||
---
|
||||
configure.ac | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 684e2d1..e5e3aab 100644
|
||||
index 0491090..4270c88 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -146,6 +146,11 @@ if test "x$GCC" = "xyes"; then
|
||||
@@ -82,6 +82,11 @@ if test "x$GCC" = "xyes"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -29,7 +28,7 @@ index 684e2d1..e5e3aab 100644
|
||||
dnl if glib is available we can enable the tests
|
||||
PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0],
|
||||
[ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`"
|
||||
@@ -156,6 +161,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0],
|
||||
@@ -92,6 +97,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0],
|
||||
build_tests="no"
|
||||
]
|
||||
)
|
||||
@@ -41,6 +40,3 @@ index 684e2d1..e5e3aab 100644
|
||||
AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes )
|
||||
dnl this enables the rule in test/Makefile.am
|
||||
AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes)
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user