Source: yadifa
Version: 2.3.10-1
Tags: ftbfs patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
When building yadifa on amd64 for an architecture that does not have
multilib support via -m64, the build fails, because yadifa concludes
that when building on amd64, one must pass -m64 to the compiler. That's
broken.
For detecting the cpu, one should use AC_CANONICAL_HOST instead of
uname. Beyond that, -m64 is wrong on x32 and that actually breaks native
builds on x32.
The attached patch fixes both. Please consider applying it.
Helmut
--- yadifa-2.3.10.orig/m4/eurid.m4
+++ yadifa-2.3.10/m4/eurid.m4
@@ -316,18 +316,15 @@
;;
esac
-case "$(uname -m)" in
- x86_64)
+AC_REQUIRE([AC_CANONICAL_HOST])
+AS_IF([test "$host_cpu" = x86_64],[
AC_DEFINE_UNQUOTED([HAS_CPU_AMDINTEL], [1], [i386, Athlon, Opteron, Core2, i3, i5, i7, ...])
AM_CONDITIONAL([HAS_CPU_AMDINTEL], [true])
AC_MSG_RESULT([AMD/Intel])
- CFLAGS3264=-m64
+ AS_IF([test "$host" = x86_64-linux-gnux32],,[CFLAGS3264=-m64])
CPU_UNKNOWN=0
cpu_intel_compatible=1
- ;;
- *)
- ;;
-esac
+])
case "${CPU_UNKNOWN}" in
1)
