[SCM] libav/ubuntu: confflags: use --enable-pic instead of manually messing with cflags

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 10 10:04:18 UTC 2012


The following commit has been merged in the ubuntu branch:
commit 4c3671eb57acbd1ce0f7d1f047b739ba40c8c8f2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 27 14:16:47 2012 +0100

    confflags: use --enable-pic instead of manually messing with cflags
    
    Also drop -marm from cflag as the configure script adds it
    automatically.
    
    Thanks to Janne Grunau and Måns Rullgard for the suggestion.
    (cherry picked from commit a5723b5b43ce2d5ab1794877f587fbc7d4b1ae42)
    
    Signed-off-by: Reinhard Tartler <siretart at tauware.de>

diff --git a/debian/confflags b/debian/confflags
index b7b3104..86445a1 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -114,7 +114,7 @@ confflags += --enable-libfreetype
 ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and Libav has
 # plenty of incompatible assembly; not sure how to detect that properly
-confflags += --extra-cflags="-marm -fPIC -DPIC"
+confflags += --enable-pic
 endif
 
 ifeq      ($(DEB_HOST_ARCH),powerpc)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list