Changeset 176198 in webkit

Timestamp:

Nov 17, 2014 2:48:39 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

[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 <Ting-Wei Lan> 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):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2014-11-17  Ting-Wei Lan  <lantw44@gmail.com>
+
+        [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-17  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
 

trunk/Tools/gtk/gtkdoc.py

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