Bug#760433: libav: FTBFS on x32: Invalid inline assembly

[Thorsten Glaser]

tags 760433 + patch
thanks

Hi *,

I just rebuilt libav and all of its dependencies on x32.
Thus, only part remaining is the detection magic.

Updated patch attached, will upload to dpo unreleased.

bye,
//mirabilos
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-235
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg
-------------- next part --------------
diff -Nru libav-11.4/debian/changelog libav-11.4/debian/changelog
--- libav-11.4/debian/changelog	2015-06-03 22:31:46.000000000 +0200
+++ libav-11.4/debian/changelog	2015-07-13 14:29:56.000000000 +0200
@@ -1,3 +1,15 @@
+libav (6:11.4-2+x32.1) unreleased; urgency=high
+
+  [ Thorsten Glaser ]
+  * Non-maintainer upload.
+  * (Closes: #760433)
+
+  [ Daniel Schepler ]
+  * Set --arch='x32' instead of --arch='amd64' for x32 builds as the
+    inline assembly fails to build. Also, enable PIC on x32.
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Mon, 13 Jul 2015 14:29:53 +0200
+
 libav (6:11.4-2) unstable; urgency=medium
 
   * debian/*.lintian-overrides: Use architecture specific overrides to fix
diff -Nru libav-11.4/debian/confflags libav-11.4/debian/confflags
--- libav-11.4/debian/confflags	2015-06-03 22:13:23.000000000 +0200
+++ libav-11.4/debian/confflags	2015-07-13 14:25:17.000000000 +0200
@@ -95,7 +95,11 @@
 endef
 
 # Common configuration flags
+ifeq ($(DEB_HOST_ARCH),x32)
+confflags += --arch='x32'
+else
 confflags += --arch='$(DEB_HOST_ARCH_CPU)'
+endif
 confflags += --enable-pthreads
 confflags += --enable-runtime-cpudetect
 confflags += --extra-version='$(DEB_VERSION)'
@@ -114,6 +118,10 @@
 confflags += --enable-pic
 endif
 
+ifeq      ($(DEB_HOST_ARCH),x32)
+confflags += --enable-pic
+endif
+
 # Additional features
 confflags += $(call cond_enable,/usr/include/bzlib.h,bzlib)
 confflags += $(call cond_enable,/usr/include/dc1394/dc1394.h,libdc1394)