diff options
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 | 22 |
1 files changed, 16 insertions, 6 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 index c7688704eb..bf03c8f613 100644 --- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | |||
@@ -1,24 +1,31 @@ | |||
1 | Use native pkg-config when looking for gtk-doc. | 1 | From 5f145621b4780cfd6a5632fcc97c45f572938efc Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Mon, 5 Sep 2016 22:25:44 +0100 | ||
4 | Subject: [PATCH 5/5] Use native pkg-config when looking for gtk-doc. | ||
2 | 5 | ||
3 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
5 | 8 | ||
9 | --- | ||
10 | gtk-doc.m4 | 7 ++++++- | ||
11 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
12 | |||
6 | diff --git a/gtk-doc.m4 b/gtk-doc.m4 | 13 | diff --git a/gtk-doc.m4 b/gtk-doc.m4 |
7 | index 3675543..94881ae 100644 | 14 | index 3675543..2590e2a 100644 |
8 | --- a/gtk-doc.m4 | 15 | --- a/gtk-doc.m4 |
9 | +++ b/gtk-doc.m4 | 16 | +++ b/gtk-doc.m4 |
10 | @@ -1,6 +1,6 @@ | 17 | @@ -1,6 +1,6 @@ |
11 | dnl -*- mode: autoconf -*- | 18 | dnl -*- mode: autoconf -*- |
12 | 19 | ||
13 | -# serial 2 | 20 | -# serial 2 |
14 | +# serial 2.1 | 21 | +# serial 2.1 |
15 | 22 | ||
16 | dnl Usage: | 23 | dnl Usage: |
17 | dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) | 24 | dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) |
18 | @@ -10,11 +10,16 @@ AC_DEFUN([GTK_DOC_CHECK], | 25 | @@ -10,11 +10,16 @@ AC_DEFUN([GTK_DOC_CHECK], |
19 | AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first | 26 | AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
20 | AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first | 27 | AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
21 | 28 | ||
22 | + gtkdoc_pkgconfig_save=$PKG_CONFIG | 29 | + gtkdoc_pkgconfig_save=$PKG_CONFIG |
23 | + PKG_CONFIG=pkg-config-native | 30 | + PKG_CONFIG=pkg-config-native |
24 | + | 31 | + |
@@ -26,9 +33,12 @@ index 3675543..94881ae 100644 | |||
26 | AC_MSG_CHECKING([for gtk-doc]) | 33 | AC_MSG_CHECKING([for gtk-doc]) |
27 | PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) | 34 | PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) |
28 | AC_MSG_RESULT($have_gtk_doc) | 35 | AC_MSG_RESULT($have_gtk_doc) |
29 | 36 | ||
30 | + PKG_CONFIG=$gtkdoc_pkgconfig_save | 37 | + PKG_CONFIG=$gtkdoc_pkgconfig_save |
31 | + | 38 | + |
32 | if test "$have_gtk_doc" = "no"; then | 39 | if test "$have_gtk_doc" = "no"; then |
33 | AC_MSG_WARN([ | 40 | AC_MSG_WARN([ |
34 | You will not be able to create source packages with 'make dist' | 41 | You will not be able to create source packages with 'make dist' |
42 | -- | ||
43 | 2.15.1 | ||
44 | |||