r27915 - in /packages/unstable/clutter-1.0/debian: changelog control control.in patches/01-Explicitly-link-the-glx-flavour-against-libdl.patch patches/series rules

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sat May 14 18:29:27 UTC 2011 

Author: sjoerd
Date: Sat May 14 18:29:24 2011
New Revision: 27915

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27915
Log:
* debian/patches/01-Explicitly-link-the-glx-flavour-against-libdl.patch:
  * Added, fixes build with binutils-gold (Closes: #554074)
* Use dh-autoreconf to re-generate the autotools bits

Added:
    packages/unstable/clutter-1.0/debian/patches/01-Explicitly-link-the-glx-flavour-against-libdl.patch
Modified:
    packages/unstable/clutter-1.0/debian/changelog
    packages/unstable/clutter-1.0/debian/control
    packages/unstable/clutter-1.0/debian/control.in
    packages/unstable/clutter-1.0/debian/patches/series
    packages/unstable/clutter-1.0/debian/rules

Modified: packages/unstable/clutter-1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/changelog?rev=27915&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/changelog [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/changelog [utf-8] Sat May 14 18:29:24 2011
@@ -6,8 +6,11 @@
   [ Sjoerd Simons ]
   * New upstream release
   * debian/watch: Updated to new download URL
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 14 May 2011 16:37:01 +0100
+  * debian/patches/01-Explicitly-link-the-glx-flavour-against-libdl.patch:
+    * Added, fixes build with binutils-gold (Closes: #554074)
+  * Use dh-autoreconf to re-generate the autotools bits
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 14 May 2011 19:28:35 +0100
 
 clutter-1.0 (1.6.10-3) unstable; urgency=low
 

Modified: packages/unstable/clutter-1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/control?rev=27915&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/control [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/control [utf-8] Sat May 14 18:29:24 2011
@@ -10,6 +10,8 @@
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 5),
                cdbs (>= 0.4.41),
+               dh-autoreconf,
+               autopoint,
                gnome-pkg-tools,
                libgl1-mesa-dev (>= 7.1~rc3-1~),
                libglib2.0-dev (>= 2.27.3),

Modified: packages/unstable/clutter-1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/control.in?rev=27915&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/control.in [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/control.in [utf-8] Sat May 14 18:29:24 2011
@@ -5,6 +5,8 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5),
                cdbs (>= 0.4.41),
+               dh-autoreconf,
+               autopoint,
                gnome-pkg-tools,
                libgl1-mesa-dev (>= 7.1~rc3-1~),
                libglib2.0-dev (>= 2.27.3),

Added: packages/unstable/clutter-1.0/debian/patches/01-Explicitly-link-the-glx-flavour-against-libdl.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/patches/01-Explicitly-link-the-glx-flavour-against-libdl.patch?rev=27915&op=file
==============================================================================
--- packages/unstable/clutter-1.0/debian/patches/01-Explicitly-link-the-glx-flavour-against-libdl.patch (added)
+++ packages/unstable/clutter-1.0/debian/patches/01-Explicitly-link-the-glx-flavour-against-libdl.patch [utf-8] Sat May 14 18:29:24 2011
@@ -1,0 +1,34 @@
+From 8db1a0db1879967d9fcc22dd3b1087a61dcdf5d6 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Sat, 14 May 2011 17:40:58 +0100
+Subject: [PATCH] Explicitly link the glx flavour against libdl
+
+The glx backends uses dlopen, as such it needs to link directly to libdl
+otherwise the build will fail if the linker doesn't enable indirect linking
+(e.g. using binutils-gold or passing --no-add-needed to ld) with warnings like:
+
+../../clutter/.libs/libclutter-glx-1.0.so: error: undefined reference to 'dlerror'
+../../clutter/.libs/libclutter-glx-1.0.so: error: undefined reference to 'dlopen'
+../../clutter/.libs/libclutter-glx-1.0.so: error: undefined reference to 'dlsym'
+---
+ configure.ac |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2576123..b75084d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -220,6 +220,10 @@ AS_CASE([$CLUTTER_FLAVOUR],
+           CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
+           CLUTTER_SONAME_INFIX=glx
+ 
++          AC_CHECK_LIB(dl, [dlopen],
++            [FLAVOUR_LIBS="$FLAVOUR_LIBS -ldl"],
++            [AC_MSG_ERROR("libdl not found")])
++
+           # Mesa 7.3 added a GL pkg-config file, finally
+           PKG_CHECK_EXISTS([gl],
+                            [BACKEND_PC_FILES="$BACKEND_PC_FILES gl"],
+-- 
+1.7.5.1
+

Modified: packages/unstable/clutter-1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/patches/series?rev=27915&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/patches/series [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/patches/series [utf-8] Sat May 14 18:29:24 2011
@@ -1,1 +1,2 @@
+01-Explicitly-link-the-glx-flavour-against-libdl.patch
 02_disable_armv5t_specific_optimization.patch

Modified: packages/unstable/clutter-1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/rules?rev=27915&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/rules [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/rules [utf-8] Sat May 14 18:29:24 2011
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk

More information about the pkg-gnome-commits mailing list