r31355 - in /desktop/experimental/gnome-settings-daemon/debian: changelog rules

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Nov 13 15:20:16 2011
New Revision: 31355

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31355
Log:
Set -z,defs *before* setting --warn-unresolved-symbols in the linker flags
otherwise the build will fail with unresolved symbol *errors*

Modified:
    desktop/experimental/gnome-settings-daemon/debian/changelog
    desktop/experimental/gnome-settings-daemon/debian/rules

Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=31355&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Sun Nov 13 15:20:16 2011
@@ -7,11 +7,15 @@
   * debian/gnome-settings-daemon.install: Also install the helper service files
 
   [ Josselin Mouette ]
-  * Disable -z defs on ia64. This should really be avoided because it 
-    can cause runtime errors, but since binutils won’t be fixed it 
+  * Disable -z defs on ia64. This should really be avoided because it
+    can cause runtime errors, but since binutils won’t be fixed it
     causes runtime errors anyway. Closes: #537572.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Thu, 10 Nov 2011 15:03:07 +0100
+  [ Sjoerd Simons ]
+  * Set -z,defs *before* setting --warn-unresolved-symbols in the linker flags
+    otherwise the build will fail with unresolved symbol *errors*
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 13 Nov 2011 16:19:27 +0100
 
 gnome-settings-daemon (3.2.1-1) experimental; urgency=low
 

Modified: desktop/experimental/gnome-settings-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/rules?rev=31355&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/rules [utf-8] Sun Nov 13 15:20:16 2011
@@ -7,10 +7,10 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-LDFLAGS += -Wl,-O1 -Wl,--warn-unresolved-symbols -Wl,--as-needed
 ifneq ($(DEB_HOST_ARCH_CPU),ia64)
   LDFLAGS += -Wl,-z,defs
 endif
+LDFLAGS += -Wl,-O1 -Wl,--warn-unresolved-symbols -Wl,--as-needed
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-pulse --enable-gconf-bridge