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

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Nov 12 22:19:06 UTC 2011


Author: joss
Date: Sat Nov 12 22:19:05 2011
New Revision: 31333

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31333
Log:
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.

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=31333&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Sat Nov 12 22:19:05 2011
@@ -1,8 +1,14 @@
 gnome-settings-daemon (3.2.1-2) UNRELEASED; urgency=low
 
+  [ Sjoerd Simons ]
   * debian/control.in: Add liblcms2-dev to the build-depends for display color
     management
   * 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 
+    causes runtime errors anyway. Closes: #537572.
 
  -- Sjoerd Simons <sjoerd at debian.org>  Thu, 10 Nov 2011 15:03:07 +0100
 

Modified: desktop/experimental/gnome-settings-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/rules?rev=31333&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/rules [utf-8] Sat Nov 12 22:19:05 2011
@@ -7,7 +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,-z,defs -Wl,--warn-unresolved-symbols -Wl,--as-needed
+LDFLAGS += -Wl,-O1 -Wl,--warn-unresolved-symbols -Wl,--as-needed
+ifneq ($(DEB_HOST_ARCH_CPU),ia64)
+  LDFLAGS += -Wl,-z,defs
+endif
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-pulse --enable-gconf-bridge




More information about the pkg-gnome-commits mailing list