Source: cairo
Version: 1.10.2-6.1
Severity: serious
Justification: fails to build from source
Tags: patch
Hi,
cairo FTBFS on latest unstable.
I confirmed with cowbuilder / amd64.
-----
../../lib/m4sugar/m4sh.m4:517: AS_CASE is expanded from...
build/aclocal.enable.m4:41: _CAIRO_ENABLE is expanded from...
build/configure.ac.features:23: CAIRO_ENABLE is expanded from...
configure.ac:646: the top level
test/Makefile.am:1735: `%'-style pattern rules are a GNU make extension
test/Makefile.am:1736: <: non-POSIX variable name
build/Makefile.am.changelog:57: `%'-style pattern rules are a GNU make extension
Makefile.am:80: `build/Makefile.am.changelog' included from here
patch -Np1 < debian/ltmain_as-needed.patch
patching file build/ltmain.sh
Hunk #1 succeeded at 5800 (offset 1084 lines).
Hunk #2 FAILED at 5075.
1 out of 2 hunks FAILED -- saving rejects to file build/ltmain.sh.rej
make: *** [configure-common-stamp] Error 1
dpkg-buildpackage: error: debian/rules build gave error exit status 2
E: Failed autobuilding of package
-----
I made a patch which revise this problem.
Could you apply this patch?
Best regards,
Nobuhiro
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
diff -Nru cairo-1.10.2/debian/ltmain_as-needed.patch cairo-1.10.2/debian/ltmain_as-needed.patch
--- cairo-1.10.2/debian/ltmain_as-needed.patch 2011-03-26 19:11:26.000000000 +0900
+++ cairo-1.10.2/debian/ltmain_as-needed.patch 2011-11-09 15:18:03.000000000 +0900
@@ -1,8 +1,6 @@
-Index: cairo/build/ltmain.sh
-===================================================================
---- cairo.orig/build/ltmain.sh 2010-06-26 16:12:17.428175248 +0200
-+++ cairo/build/ltmain.sh 2010-06-26 16:13:17.044176141 +0200
-@@ -4716,6 +4716,11 @@
+--- a/build/ltmain.sh 2011-11-09 14:47:02.000000000 +0900
++++ b/build/ltmain.sh 2011-11-09 14:48:31.000000000 +0900
+@@ -5800,6 +5800,11 @@
arg=$func_stripname_result
;;
@@ -14,19 +12,19 @@
-Wl,*)
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
-@@ -5070,6 +5075,15 @@
+@@ -6163,6 +6168,15 @@
lib=
found=no
case $deplib in
-+ -Wl,--as-needed)
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ deplibs="$deplib $deplibs"
-+ fi
-+ continue
-+ ;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++ -Wl,--as-needed)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ fi
++ continue
++ ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
