[SCM] libav/master: Install the shared flavor last

[lool at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fc5906243ebf0e10ecfe547fc4614cbfabffc2b0
Author: Loïc Minier <lool at debian.org>
Date:   Mon Jun 25 21:18:59 2012 +0200

    Install the shared flavor last
    
    The binaries from the optimized flavor(s) would overwrite the ones from
    the shared baseline flavor causing SIGILL; closes: #657885.

diff --git a/debian/confflags b/debian/confflags
index 66b1830..c31f88d 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -1,12 +1,6 @@
 # -*- mode: makefile -*-
 # vim:syntax=make
 
-# build a static version on every architecture in the 'debian' Libav package
-FLAVORS := static
-
-# shared is generic, i.e. without arch specific opcodes
-FLAVORS += shared
-
 export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -20,6 +14,9 @@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
     CROSS :=  $(DEB_HOST_GNU_TYPE)-
 endif
 
+# list of flavors we want to build
+FLAVORS :=
+
 # this outputs 0 or 1 depending on whether a macro appears in the *default* cpp
 # -dM -P output; this is used to test the toolchain *default* configuration
 check_cpp = $(shell $(CROSS)cpp -dM -P /dev/null | grep -q '^\#define $(1)' && echo 1 || echo 0)
@@ -70,6 +67,15 @@ else ifeq ($(DEB_HOST_ARCH),sparc)
     nooptflags += --disable-vis
 endif
 
+# build a static version on every architecture in the 'debian' Libav package
+FLAVORS += static
+
+# shared is generic, i.e. without arch specific opcodes
+# /!\ order matters, you want to list the shared flavor *last* so that the
+# binaries from this flavor overwrite the ones from the optional optimized
+# flavor(s) and from the static flavor
+FLAVORS += shared
+
 $(info Building FLAVORS=$(FLAVORS))
 
 # Conditionally enable certain features depending on

-- 
Libav/FFmpeg packaging