r31986 - in /desktop/unstable/gobject-introspection/debian: changelog patches/00git_link_order.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Thu Dec  8 12:21:27 2011
New Revision: 31986

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31986
Log:
Add 00git_link_order.patch: scanner: Put the -l library names after the
.o, to fix FTBFS with cmake projects. Patch backported from upstream git
head. (LP: #897816)

Added:
    desktop/unstable/gobject-introspection/debian/patches/00git_link_order.patch
Modified:
    desktop/unstable/gobject-introspection/debian/changelog
    desktop/unstable/gobject-introspection/debian/patches/series

Modified: desktop/unstable/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/changelog?rev=31986&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/changelog [utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/changelog [utf-8] Thu Dec  8 12:21:27 2011
@@ -9,6 +9,11 @@
   [ Loïc Minier ]
   * dh_girepository: don't override LD_LIBRARY_PATH completely; fakeroot needs
     it.
+
+  [ Martin Pitt ]
+  * Add 00git_link_order.patch: scanner: Put the -l library names after the
+    .o, to fix FTBFS with cmake projects. Patch backported from upstream git
+    head. (LP: #897816)
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 20 Nov 2011 15:54:11 +0000
 

Added: desktop/unstable/gobject-introspection/debian/patches/00git_link_order.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/patches/00git_link_order.patch?rev=31986&op=file
==============================================================================
--- desktop/unstable/gobject-introspection/debian/patches/00git_link_order.patch (added)
+++ desktop/unstable/gobject-introspection/debian/patches/00git_link_order.patch [utf-8] Thu Dec  8 12:21:27 2011
@@ -1,0 +1,50 @@
+From 169b6680c0f765ba8a0045a29f2fcf41ea81e80a Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid at kde.org>
+Date: Tue, 29 Nov 2011 18:45:55 +0000
+Subject: scanner: Put the -l library names after the .o
+
+That is how gcc expects them.
+
+From the gcc man page:
+-llibrary
+   Search the library named library when linking.
+
+   It makes a difference where in the command you write this option; the linker
+searches and processes libraries and object files in the order they are
+specified.  Thus, foo.o -lz bar.o searches library z after file foo.o but
+before bar.o.  If bar.o refers to functions in z, those functions may not be
+loaded.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=664616
+---
+(limited to 'giscanner/dumper.py')
+
+diff --git a/giscanner/dumper.py b/giscanner/dumper.py
+index 7c2eba8..baa51a9 100644
+--- a/giscanner/dumper.py
++++ b/giscanner/dumper.py
+@@ -238,17 +238,17 @@ class DumpCompiler(object):
+         # likely to be uninstalled yet and we want the uninstalled RPATHs have
+         # priority (or we might run with installed library that is older)
+ 
+-        if not self._options.external_library:
+-            self._add_link_internal_args(args, libtool)
+-        else:
+-            self._add_link_external_args(args)
+-
+         for source in sources:
+             if not os.path.exists(source):
+                 raise CompilerError(
+                     "Could not find object file: %s" % (source, ))
+         args.extend(list(sources))
+ 
++        if not self._options.external_library:
++            self._add_link_internal_args(args, libtool)
++        else:
++            self._add_link_external_args(args)
++
+         if not self._options.quiet:
+             print "g-ir-scanner: link: %s" % (
+                 subprocess.list2cmdline(args), )
+--
+cgit v0.9.0.2

Modified: desktop/unstable/gobject-introspection/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/patches/series?rev=31986&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/patches/series [utf-8] Thu Dec  8 12:21:27 2011
@@ -1,0 +1,1 @@
+00git_link_order.patch