Changeset 151135 in webkit

Timestamp:

Jun 3, 2013 3:25:19 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by Erik van Pienbroek <​epienbro@fedoraproject.org> 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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (1 diff)
• gtk/gtkdoc.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-06-03  Erik van Pienbroek  <epienbro@fedoraproject.org>
+
+        [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-06-03  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Tools/GNUmakefile.am

@@ -401 +401 @@
         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:

trunk/Tools/gtk/gtkdoc.py

@@ -397 +397 @@
         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)