[SCM] ffmpeg/master.snapshot: confflags: switch to DEB_HOST_GNU_CPU on arm

[lool at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit bd5c20e84f1952675c6079f00284275a2af6c716
Author: Loïc Minier <lool at dooz.org>
Date:   Sun Sep 5 22:37:36 2010 +0200

    confflags: switch to DEB_HOST_GNU_CPU on arm
    
    debian/confflags: switch to testing DEB_HOST_GNU_CPU == arm instead of
    DEB_HOST_ARCH == armel as this is more portable (especially to armhf, as
    the arm port probably isn't used anymore, but that should still work).

diff --git a/debian/confflags b/debian/confflags
index cc90353..387ea23 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -8,6 +8,7 @@ FLAVORS := static
 FLAVORS += shared
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_HOST_GNU_CPU   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
@@ -27,7 +28,7 @@ check_asm = $(shell echo 'void foo(void) { __asm__ volatile("$(1)"); }' | $(CC)
 
 # the other flavors always build dynamic versions
 # Also, disable architecture-specific optimizations for default shared build
-ifeq ($(DEB_HOST_ARCH),armel)
+ifeq ($(DEB_HOST_GNU_CPU),arm)
     # whether the toolchain *default* configuration includes vfp and neon
     vfp_asm := fadds s0, s0, s0
     has_vfp := $(call check_asm, $(vfp_asm))
@@ -102,7 +103,7 @@ ifeq      ($(DEB_HOST_ARCH),ia64)
 confflags += --disable-decoder=aac --disable-encoder=aac
 endif
 
-ifeq      ($(DEB_HOST_ARCH),armel)
+ifeq      ($(DEB_HOST_GNU_CPU),arm)
 # this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has
 # plenty of incompatible assembly; not sure how to detect that properly
 confflags += --extra-cflags="-marm -fPIC -DPIC"
@@ -155,7 +156,7 @@ endif
 shared_build_confflags += --enable-shared
 shared_build_confflags += --disable-static
 
-## armel architecture specific
+## specific to arm architectures
 # Configuration flags for the optimised shared libraries
 vfp_build_confflags += $(confflags)
 vfp_build_confflags += --shlibdir=/usr/lib/vfp

-- 
FFmpeg packaging