[gobject-introspection] fix bug#605156 by ordering libtool archives that may pull in system paths at the end of the libtool



commit e14bdebab725263c3d6f97267090cbf5d06b99d2
Author: Michael Meeks <michael meeks novell com>
Date:   Fri Jun 25 15:38:18 2010 +0100

    fix bug#605156 by ordering libtool archives that may pull in system
    paths at the end of the libtool command-line

 giscanner/dumper.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/giscanner/dumper.py b/giscanner/dumper.py
index 14540d9..813b0ef 100644
--- a/giscanner/dumper.py
+++ b/giscanner/dumper.py
@@ -197,6 +197,7 @@ class DumpCompiler(object):
         # Search the current directory first
         args.append('-L.')
 
+        libtool_args = []
         uninst_builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
         # hack for building GIRepository.gir, skip -lgirepository-1.0 since
         # libgirepository-1.0.la is not in current directory and we refer to it
@@ -206,7 +207,7 @@ class DumpCompiler(object):
                 self._options.libraries[0] == 'girepository-1.0'):
                 continue
             if library.endswith(".la"): # explicitly specified libtool library
-                args.append(library)
+                libtool_args.append(library)
             else:
                 args.append('-l' + library)
 
@@ -221,6 +222,8 @@ class DumpCompiler(object):
             if not os.path.exists(source):
                 raise CompilerError(
                     "Could not find object file: %s" % (source, ))
+        # need to be late - cf. bug#605156
+        args.extend(libtool_args);
         args.extend(list(sources))
 
         subprocess.check_call(args)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]