[Pkg-cups-devel] r705 - in cupsys/trunk: . debian

[Martin Pitt]

Author: mpitt
Date: Sun Mar 16 18:48:18 2008
New Revision: 705

Log:
* debian/rules: Explicitly build with -fno-stack-protector on arm and armel,
  since the compiler produces segfaulting binaries. Works around #469517.

Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/rules

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Sun Mar 16 18:48:18 2008
@@ -12,8 +12,10 @@
   * Move scripting examples from cupsys to libcupsys2-dev. No need to install
     those 1.3 MB by default on every system, this is much more developer
     oriented. Mention this in the package description.
+  * debian/rules: Explicitly build with -fno-stack-protector on arm and armel,
+    since the compiler produces segfaulting binaries. Works around #469517.
 
- -- Martin Pitt <mpitt at debian.org>  Tue, 11 Mar 2008 21:20:11 +0100
+ -- Martin Pitt <mpitt at debian.org>  Sun, 16 Mar 2008 14:18:22 +0100
 
 cupsys (1.3.6-1) unstable; urgency=low
 

Modified: cupsys/trunk/debian/rules
==============================================================================
--- cupsys/trunk/debian/rules	(original)
+++ cupsys/trunk/debian/rules	Sun Mar 16 18:48:18 2008
@@ -18,7 +18,12 @@
 
 unpatch: deapply-dpatches
 
-DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --libdir=/usr/lib --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --localedir=/usr/share/cups/locale --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads --enable-static --enable-dbus --enable-gssapi --disable-pdftops --disable-launchd --with-cups-group=lp --with-system-groups=lpadmin --with-printcap=/var/run/cups/printcap --with-log-file-perm=0640
+# workaround for http://bugs.debian.org/469517
+ifneq ($(findstring $(DEB_BUILD_ARCH), arm armel),)
+  CFLAGS += -fno-stack-protector
+endif
+
+DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --libdir=/usr/lib --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --localedir=/usr/share/cups/locale --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads --enable-static --enable-dbus --enable-gssapi --disable-pdftops --disable-launchd --with-cups-group=lp --with-system-groups=lpadmin --with-printcap=/var/run/cups/printcap --with-log-file-perm=0640 CFLAGS="$(CFLAGS)"
 DEB_MAKE_INSTALL_TARGET := install BUILDROOT=$(DEB_DESTDIR)
 DEB_INSTALL_CHANGELOGS_ALL := CHANGES.txt
 DEB_DH_STRIP_ARGS := --dbg-package=cupsys-dbg