diff options
author | Ross Burton <ross.burton@intel.com> | 2016-09-05 22:25:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-09 12:12:23 +0100 |
commit | 620e2bf936e970a50551a178a175c4860b975dbb (patch) | |
tree | 0a112f4d7cbc311b6428884a12ec223e37511496 /meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | |
parent | 5041e6811f8d30ec6a4940a45b3b552d993e7a50 (diff) | |
download | poky-620e2bf936e970a50551a178a175c4860b975dbb.tar.gz |
gtk-doc: use pkg-config-native in native gtk-doc.m4
When building gtk-doc-native the m4 functions for autoconf should use
pkg-config-native instead of pkg-config so that they can find the native
tooling.
This means that it is possible to generate gtk-doc without building the target
packages.
(From OE-Core rev: 755724d9d5f023450392ae8025a0cb6264283028)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch')
-rw-r--r-- | meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch new file mode 100644 index 0000000000..c7688704eb --- /dev/null +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Use native pkg-config when looking for gtk-doc. | ||
2 | |||
3 | Upstream-Status: Inappropriate | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
5 | |||
6 | diff --git a/gtk-doc.m4 b/gtk-doc.m4 | ||
7 | index 3675543..94881ae 100644 | ||
8 | --- a/gtk-doc.m4 | ||
9 | +++ b/gtk-doc.m4 | ||
10 | @@ -1,6 +1,6 @@ | ||
11 | dnl -*- mode: autoconf -*- | ||
12 | |||
13 | -# serial 2 | ||
14 | +# serial 2.1 | ||
15 | |||
16 | dnl Usage: | ||
17 | dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) | ||
18 | @@ -10,11 +10,16 @@ AC_DEFUN([GTK_DOC_CHECK], | ||
19 | AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
20 | AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
21 | |||
22 | + gtkdoc_pkgconfig_save=$PKG_CONFIG | ||
23 | + PKG_CONFIG=pkg-config-native | ||
24 | + | ||
25 | ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) | ||
26 | AC_MSG_CHECKING([for gtk-doc]) | ||
27 | PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) | ||
28 | AC_MSG_RESULT($have_gtk_doc) | ||
29 | |||
30 | + PKG_CONFIG=$gtkdoc_pkgconfig_save | ||
31 | + | ||
32 | if test "$have_gtk_doc" = "no"; then | ||
33 | AC_MSG_WARN([ | ||
34 | You will not be able to create source packages with 'make dist' | ||