Title: [151386] releases/WebKitGTK/webkit-2.0/Tools
Revision
151386
Author
[email protected]
Date
2013-06-10 05:57:52 -0700 (Mon, 10 Jun 2013)

Log Message

Merge r151135 - [GTK] Respect PKG_CONFIG env variable when generating gtk-doc
https://bugs.webkit.org/show_bug.cgi?id=117168

Patch by Erik van Pienbroek <[email protected]> on 2013-06-03
Reviewed by Martin Robinson.

The tool generate-gtkdoc internally calls pkg-config.
When cross-compiling it shouldn't use pkg-config, but
it should use the pkg-config which was detected by
the ./configure script (for example this can be
i686-w64-mingw32-pkg-config when cross-compiling)

* GNUmakefile.am:
* gtk/gtkdoc.py:
(PkgConfigGTKDoc.__init__):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.0/Tools/ChangeLog (151385 => 151386)


--- releases/WebKitGTK/webkit-2.0/Tools/ChangeLog	2013-06-10 12:42:48 UTC (rev 151385)
+++ releases/WebKitGTK/webkit-2.0/Tools/ChangeLog	2013-06-10 12:57:52 UTC (rev 151386)
@@ -1,3 +1,20 @@
+2013-06-03  Erik van Pienbroek  <[email protected]>
+
+        [GTK] Respect PKG_CONFIG env variable when generating gtk-doc
+        https://bugs.webkit.org/show_bug.cgi?id=117168
+
+        Reviewed by Martin Robinson.
+
+        The tool generate-gtkdoc internally calls pkg-config.
+        When cross-compiling it shouldn't use pkg-config, but
+        it should use the pkg-config which was detected by
+        the ./configure script (for example this can be
+        i686-w64-mingw32-pkg-config when cross-compiling)
+
+        * GNUmakefile.am:
+        * gtk/gtkdoc.py:
+        (PkgConfigGTKDoc.__init__):
+
 2013-05-18  Alberto Garcia  <[email protected]>
 
         [GTK] Parallel build fails if gtk-doc is enabled

Modified: releases/WebKitGTK/webkit-2.0/Tools/GNUmakefile.am (151385 => 151386)


--- releases/WebKitGTK/webkit-2.0/Tools/GNUmakefile.am	2013-06-10 12:42:48 UTC (rev 151385)
+++ releases/WebKitGTK/webkit-2.0/Tools/GNUmakefile.am	2013-06-10 12:57:52 UTC (rev 151386)
@@ -394,7 +394,7 @@
 	  fi; \
 	fi
 endif
-	@$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
+	@$(AM_V_GEN) PKG_CONFIG=$(PKG_CONFIG) $(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
 
 uninstall-local:
 if ENABLE_WEBKIT1

Modified: releases/WebKitGTK/webkit-2.0/Tools/gtk/gtkdoc.py (151385 => 151386)


--- releases/WebKitGTK/webkit-2.0/Tools/gtk/gtkdoc.py	2013-06-10 12:42:48 UTC (rev 151385)
+++ releases/WebKitGTK/webkit-2.0/Tools/gtk/gtkdoc.py	2013-06-10 12:57:52 UTC (rev 151386)
@@ -396,19 +396,21 @@
     def __init__(self, pkg_config_path, args):
         super(PkgConfigGTKDoc, self).__init__(args)
 
+        pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
+
         if not os.path.exists(pkg_config_path):
             raise Exception('Could not find pkg-config file at: %s'
                             % pkg_config_path)
 
-        self.cflags += " " + self._run_command(['pkg-config',
+        self.cflags += " " + self._run_command([pkg_config,
                                                 pkg_config_path,
                                                 '--cflags'], print_output=False)
-        self.ldflags += " " + self._run_command(['pkg-config',
+        self.ldflags += " " + self._run_command([pkg_config,
                                                 pkg_config_path,
                                                 '--libs'], print_output=False)
-        self.version = self._run_command(['pkg-config',
+        self.version = self._run_command([pkg_config,
                                           pkg_config_path,
                                           '--modversion'], print_output=False)
-        self.prefix = self._run_command(['pkg-config',
+        self.prefix = self._run_command([pkg_config,
                                          pkg_config_path,
                                          '--variable=prefix'], print_output=False)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to