Title: [176394] releases/WebKitGTK/webkit-2.6/Tools
- Revision
- 176394
- Author
- [email protected]
- Date
- 2014-11-20 05:12:55 -0800 (Thu, 20 Nov 2014)
Log Message
Merge r176198 - [GTK] Add library search paths from LDFLAGS before pkg-config --libs
https://bugs.webkit.org/show_bug.cgi?id=136018
Patch by Ting-Wei Lan <[email protected]> on 2014-11-17
Reviewed by Carlos Garcia Campos.
It is possible that the order of -L arguments in the output of
pkg-config is wrong, which causes the linker to find the wrong
version (usually older version) of libraries when running
gtkdoc-scangobj.
* gtk/gtkdoc.py:
(GTKDoc._run_gtkdoc_scangobj):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Tools/ChangeLog (176393 => 176394)
--- releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-11-20 12:46:15 UTC (rev 176393)
+++ releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-11-20 13:12:55 UTC (rev 176394)
@@ -1,3 +1,18 @@
+2014-11-17 Ting-Wei Lan <[email protected]>
+
+ [GTK] Add library search paths from LDFLAGS before pkg-config --libs
+ https://bugs.webkit.org/show_bug.cgi?id=136018
+
+ Reviewed by Carlos Garcia Campos.
+
+ It is possible that the order of -L arguments in the output of
+ pkg-config is wrong, which causes the linker to find the wrong
+ version (usually older version) of libraries when running
+ gtkdoc-scangobj.
+
+ * gtk/gtkdoc.py:
+ (GTKDoc._run_gtkdoc_scangobj):
+
2014-11-13 Dan Bernstein <[email protected]>
Policy client not called for navigations through the page cache
Modified: releases/WebKitGTK/webkit-2.6/Tools/gtk/gtkdoc.py (176393 => 176394)
--- releases/WebKitGTK/webkit-2.6/Tools/gtk/gtkdoc.py 2014-11-20 12:46:15 UTC (rev 176393)
+++ releases/WebKitGTK/webkit-2.6/Tools/gtk/gtkdoc.py 2014-11-20 13:12:55 UTC (rev 176394)
@@ -313,7 +313,11 @@
env = os.environ
ldflags = self.ldflags
if self.library_path:
- ldflags = ' "-L%s" ' % self.library_path + ldflags
+ additional_ldflags = ''
+ for arg in env.get('LDFLAGS', '').split(' '):
+ if arg.startswith('-L'):
+ additional_ldflags = '%s %s' % (additional_ldflags, arg)
+ ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags
current_ld_library_path = env.get('LD_LIBRARY_PATH')
if current_ld_library_path:
env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
