gobject-introspection r662 - in trunk: . tools

[lucasr svn gnome org]

Author: lucasr
Date: Fri Oct 10 21:24:32 2008
New Revision: 662
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=662&view=rev

Log:
2008-10-10  Lucas Rocha  <lucasr gnome org>

	Bug 555293: append library_paths to LPATH env variable to work
	around a bug in find_library when using ldconfig.

	* tools/g-ir-scanner (main): ditto.


Modified:
   trunk/ChangeLog
   trunk/tools/g-ir-scanner

Modified: trunk/tools/g-ir-scanner
==============================================================================
--- trunk/tools/g-ir-scanner	(original)
+++ trunk/tools/g-ir-scanner	Fri Oct 10 21:24:32 2008
@@ -203,6 +203,16 @@
         pkg_options, unused = parser.parse_args(filtered_output)
         options.library_paths.extend(pkg_options.library_paths)
 
+    # FIXME: using LPATH is definitely not portable enough. Using Python's
+    # find_library for finding our shared libraries is not a portable enough
+    # anyway as it behaves differently depending on the OS
+    lpath = os.environ.get('LPATH')
+    library_path = ':'.join(options.library_paths)
+    if lpath:
+        os.environ['LPATH'] = ':'.join([lpath, library_path])
+    else:
+        os.environ['LPATH'] = library_path
+
     filenames = []
     for arg in args:
         if (arg.endswith('.c') or