Title: [184551] releases/WebKitGTK/webkit-2.4
Revision
184551
Author
[email protected]
Date
2015-05-18 23:43:06 -0700 (Mon, 18 May 2015)

Log Message

[W32] Buildsystem may use wrong Python interpreter
https://bugs.webkit.org/show_bug.cgi?id=143755

Patch by Руслан Ижбулатов <[email protected]> on 2015-04-15
Reviewed by Carlos Garcia Campos.

Use confgured Python interpreter

Configure script has tests for Python (AC_PATH_PROG(PYTHON, python)),
use the interpretor they provide (which is overridable by user by
the way of passing PYTHON=... to configure) instead of the first
thing found in PATH.

Otherwise wrong version of Python might be used. Mingw-python,
for example, which has commandline length limit, which results in
errors like:
/usr/bin/env: python: Argument list too long
GNUmakefile:82317: recipe for target
'DerivedSources/WebInspectorUI/GResourceBundle.xml' failed

Source/WebInspectorUI:

* GNUmakefile.am:

Tools:

* gtk/GNUmakefile.am:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog (184550 => 184551)


--- releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog	2015-05-19 06:40:15 UTC (rev 184550)
+++ releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog	2015-05-19 06:43:06 UTC (rev 184551)
@@ -1,3 +1,26 @@
+2015-04-15  Руслан Ижбулатов  <[email protected]>
+
+        [W32] Buildsystem may use wrong Python interpreter
+        https://bugs.webkit.org/show_bug.cgi?id=143755
+
+        Reviewed by Carlos Garcia Campos.
+
+        Use confgured Python interpreter
+
+        Configure script has tests for Python (AC_PATH_PROG(PYTHON, python)),
+        use the interpretor they provide (which is overridable by user by
+        the way of passing PYTHON=... to configure) instead of the first
+        thing found in PATH.
+
+        Otherwise wrong version of Python might be used. Mingw-python,
+        for example, which has commandline length limit, which results in
+        errors like:
+        /usr/bin/env: python: Argument list too long
+        GNUmakefile:82317: recipe for target
+        'DerivedSources/WebInspectorUI/GResourceBundle.xml' failed
+
+        * GNUmakefile.am:
+
 2014-09-25  Carlos Garcia Campos  <[email protected]>
 
         Unreviewed. Fix make distcheck.

Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/GNUmakefile.am (184550 => 184551)


--- releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/GNUmakefile.am	2015-05-19 06:40:15 UTC (rev 184550)
+++ releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/GNUmakefile.am	2015-05-19 06:43:06 UTC (rev 184551)
@@ -13,7 +13,7 @@
 	$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py
 	$(AM_V_GEN)
 	$(AM_V_at)mkdir -p ${GENSOURCES_WEBINSPECTOR_UI}
-	$(AM_V_at)$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py --output $@ $(inspector_files)
+	$(AM_V_at)$(PYTHON) $(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py --output $@ $(inspector_files)
 
 ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.c: DerivedSources/WebInspectorUI/GResourceBundle.xml
 	$(AM_V_GEN)

Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (184550 => 184551)


--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog	2015-05-19 06:40:15 UTC (rev 184550)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog	2015-05-19 06:43:06 UTC (rev 184551)
@@ -1,3 +1,26 @@
+2015-04-15  Руслан Ижбулатов  <[email protected]>
+
+        [W32] Buildsystem may use wrong Python interpreter
+        https://bugs.webkit.org/show_bug.cgi?id=143755
+
+        Reviewed by Carlos Garcia Campos.
+
+        Use confgured Python interpreter
+
+        Configure script has tests for Python (AC_PATH_PROG(PYTHON, python)),
+        use the interpretor they provide (which is overridable by user by
+        the way of passing PYTHON=... to configure) instead of the first
+        thing found in PATH.
+
+        Otherwise wrong version of Python might be used. Mingw-python,
+        for example, which has commandline length limit, which results in
+        errors like:
+        /usr/bin/env: python: Argument list too long
+        GNUmakefile:82317: recipe for target
+        'DerivedSources/WebInspectorUI/GResourceBundle.xml' failed
+
+        * gtk/GNUmakefile.am:
+
 2014-11-28  Carlos Garcia Campos  <[email protected]>
 
         [GTK] Use custom _javascript_ instead of DBus to implement WebProcess tests

Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/GNUmakefile.am (184550 => 184551)


--- releases/WebKitGTK/webkit-2.4/Tools/gtk/GNUmakefile.am	2015-05-19 06:40:15 UTC (rev 184550)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/GNUmakefile.am	2015-05-19 06:43:06 UTC (rev 184551)
@@ -35,7 +35,7 @@
 	gtkdoc-webkitdom.cfg
 
 docs-build.stamp: $(docs_build_dependencies)
-	CC=$(CC) $(srcdir)/Tools/gtk/generate-gtkdoc
+	CC=$(CC) $(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc
 	@touch docs-build.stamp
 
 clean-local: doc-clean-local
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to