[SCM] libvpx/master: Build generic-gnu on armel/armhf because armv6-linux-gcc support was dropped

[onovy at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 252a327c360e49d6ff970187ed2ee9a2def6b5ac
Author: Ondřej Nový <onovy at debian.org>
Date:   Tue Jan 17 17:02:18 2017 +0100

    Build generic-gnu on armel/armhf because armv6-linux-gcc support was dropped

diff --git a/debian/rules b/debian/rules
index 669038d..21f6826 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,23 +29,16 @@ configure_flags_neon := $(configure_flags) --target=armv7-linux-gcc
 BUILD_NEON=Yes
 endif
 
-ifeq ($(DEB_HOST_ARCH), armel)
-ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
-configure_flags += --target=armv6-linux-gcc --enable-small
-else
-configure_flags += --target=generic-gnu
-endif
-else
 ifeq ($(DEB_HOST_ARCH), arm64)
 configure_flags += --target=arm64-linux-gcc
 else
+ifeq ($(DEB_HOST_ARCH), armel)
+configure_flags += --target=generic-gnu --enable-small
+else
 ifeq ($(DEB_HOST_ARCH), armhf)
 # now armhf is ARMv7, but ARMv7 in vpx means NEON, which is not mandatory on armhf
-# thus we use ARMv6 and -marm (since no thumb2 on ARMv6) to ensure compatability
-# with all ARMv7 cores we support.
-DEB_CFLAGS_MAINT_APPEND += -marm
-DEB_CXXFLAGS_MAINT_APPEND += -marm
-configure_flags += --target=armv6-linux-gcc --enable-small
+# thus we use generic-gnu
+configure_flags += --target=generic-gnu --enable-small
 else
 ifeq ($(DEB_HOST_ARCH), amd64)
 configure_flags += --target=x86_64-linux-gcc

-- 
libvpx packaging