[oe-commits] [openembedded-core] 07/21: gtk-doc: use pkg-config-native in native gtk-doc.m4

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit fad357e22d930de1abb7684221ad8f6974c6b124
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Mon Sep 5 22:25:44 2016 +0100

    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.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 .../gtk-doc/files/pkg-config-native.patch          | 29 ++++++++++++++++++++++
 meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb         |  5 ++--
 2 files changed, 31 insertions(+), 3 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 0000000..422bc88
--- /dev/null
+++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
@@ -0,0 +1,29 @@
+diff --git a/gtk-doc.m4 b/gtk-doc.m4
+index 3675543..94881ae 100644
+--- a/gtk-doc.m4
++++ b/gtk-doc.m4
+@@ -1,6 +1,6 @@
+ dnl -*- mode: autoconf -*-
+
+-# serial 2
++# serial 3
+
+ dnl Usage:
+ dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+@@ -10,6 +10,9 @@ AC_DEFUN([GTK_DOC_CHECK],
+   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+ 
++  SAVEPKGCONFIG=$PKG_CONFIG
++  PKG_CONFIG=pkg-config-native
++
+   ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
+   AC_MSG_CHECKING([for gtk-doc])
+   PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
+@@ -85,4 +88,6 @@ AC_DEFUN([GTK_DOC_CHECK],
+   AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
+   AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+   AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
++
++  PKG_CONFIG=$SAVEPKGCONFIG
+ ])
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb
index 6587800..01173d5 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb
@@ -10,8 +10,8 @@ DEPENDS_append = "libxslt xmlto source-highlight-native"
 EXTRA_OECONF_append = " --with-highlight=source-highlight"
 EXTRA_OECONF_append_class-native = " --with-xml-catalog=${sysconfdir}/xml/catalog.xml"
 
-SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
-           "
+SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch"
+SRC_URI_append_class-native = " file://pkg-config-native.patch"
 
 SRC_URI[archive.md5sum] = "0dc6570953112a464a409fb99258ccbc"
 SRC_URI[archive.sha256sum] = "1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42"
@@ -37,4 +37,3 @@ gtkdoc_makefiles_sysroot_preprocess() {
            -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \
            ${SYSROOT_DESTDIR}${datadir}/gtk-doc/data/gtk-doc*make
 }
-

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.