[Pkg-utopia-commits] r1447 - in /packages/unstable/avahi/debian: changelog rules

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Fri Apr 27 10:45:14 2007
New Revision: 1447

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1447
Log:
* debian/rules:
  + Disable gcc's strack protection on all archs except those that actually
    support it (powerpc s390 sparc amd64 i386). Fixes FTBS on the other
    architectures.

Modified:
    packages/unstable/avahi/debian/changelog
    packages/unstable/avahi/debian/rules

Modified: packages/unstable/avahi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/changelog?rev=1447&op=diff
==============================================================================
--- packages/unstable/avahi/debian/changelog (original)
+++ packages/unstable/avahi/debian/changelog Fri Apr 27 10:45:14 2007
@@ -12,6 +12,10 @@
   * debian/avahi-daemon.{ifupdown,resolvconf}:
     + Check if avahi-daemon-check-dns.sh is executable before executing it
       (Closes:  #419259)
+  * debian/rules:
+    + Disable gcc's strack protection on all archs except those that actually
+      support it (powerpc s390 sparc amd64 i386). Fixes FTBS on the other
+      architectures.
 
   [ Michael Biebl ]
   * Start avahi-daemon and avahi-dnsconfd as regular SysV init scripts.
@@ -47,7 +51,7 @@
     + Update the Vcs control field from XS-X-Vcs-Svn to XS-Vcs-Svn.
     + Add XS-Vcs-Browser control field.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 27 Apr 2007 11:48:45 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 27 Apr 2007 12:43:08 +0200
 
 avahi (0.6.18-3) unstable; urgency=low
 

Modified: packages/unstable/avahi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/rules?rev=1447&op=diff
==============================================================================
--- packages/unstable/avahi/debian/rules (original)
+++ packages/unstable/avahi/debian/rules Fri Apr 27 10:45:14 2007
@@ -3,13 +3,12 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/buildvars.mk
 include debian/clean-la.mk
 
 # List any files which are not installed
 include /usr/share/cdbs/1/rules/utils.mk
 common-binary-post-install-arch:: list-missing
-
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 # Ensure at build time that the library has no dependencies on undefined
 # symbols, and speed up loading.
@@ -17,6 +16,11 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-compat-libdns_sd --enable-compat-howl \
                              --disable-mono --disable-monodoc
+
+# Only enable the stack protector on certain archs
+ifeq (,$(filter $(DEB_BUILD_ARCH), powerpc s390 sparc amd64 i386))
+  DEB_CONFIGURE_EXTRA_FLAGS += --disable-stack-protector
+endif
 
 DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 16 0 1 6 .