On Mon, May 02, 2011 at 02:41:52PM +0200, Lucas Nussbaum wrote:
> Source: cairo
> Version: 1.10.2-6
> Severity: serious
> Tags: wheezy sid
> User: debian...@lists.debian.org
> Usertags: qa-ftbfs-20110502 qa-ftbfs
> Justification: FTBFS on amd64
> 
> Hi,
> 
> During a rebuild of all packages in sid, your package failed to build on
> amd64.
> 

I have just done an NMU to fix this longstanding issue. Please find the
patch below.

diff -Nru cairo-1.10.2/debian/changelog cairo-1.10.2/debian/changelog
--- cairo-1.10.2/debian/changelog       2011-03-26 11:11:26.000000000 +0100
+++ cairo-1.10.2/debian/changelog       2011-07-29 19:01:38.000000000 +0200
@@ -1,3 +1,11 @@
+cairo (1.10.2-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Disable -flto support as it currently doesn't work with -Wl,--as-needed.
+    Closes: #625159.
+
+ -- Aurelien Jarno <aure...@debian.org>  Fri, 29 Jul 2011 19:00:54 +0200
+
 cairo (1.10.2-6) unstable; urgency=low
 
   * debian/patches/03_export-symbols.patch:
diff -Nru cairo-1.10.2/debian/patches/05-flto.patch 
cairo-1.10.2/debian/patches/05-flto.patch
--- cairo-1.10.2/debian/patches/05-flto.patch   1970-01-01 01:00:00.000000000 
+0100
+++ cairo-1.10.2/debian/patches/05-flto.patch   2011-07-29 19:00:41.000000000 
+0200
@@ -0,0 +1,13 @@
+Disable -flto as it is currently doesn't work with -Wl,--as-needed
+
+--- cairo-1.10.2.orig/build/configure.ac.warnings
++++ cairo-1.10.2/build/configure.ac.warnings
+@@ -27,7 +27,7 @@ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_T
+ 
+ dnl We also abuse the warning-flag facility to enable other compiler
+ dnl options.  Namely, the following:
+-MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
++MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+ 
+ dnl Also to turn various gcc/glibc-specific preprocessor checks
+ MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
diff -Nru cairo-1.10.2/debian/patches/series cairo-1.10.2/debian/patches/series
--- cairo-1.10.2/debian/patches/series  2011-03-26 11:11:26.000000000 +0100
+++ cairo-1.10.2/debian/patches/series  2011-07-29 19:00:51.000000000 +0200
@@ -2,3 +2,4 @@
 02_am-maintainer-mode.patch
 03_export-symbols.patch
 04-LD_PRELOAD-is-supported-on-Hurd.patch
+05-flto.patch


-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurel...@aurel32.net                 http://www.aurel32.net



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to