[SCM] x264/master: Meanwhile, upstream enabled PIC for the shared library build on ia64, mips* and hppa/parisc (once more closes: #642810), so remove our Debian-specific workarounds.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 17f465120e98eb19e19f8e68fdcde530a89e572c
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Mon Feb 6 09:50:35 2012 +0100

    Meanwhile, upstream enabled PIC for the shared library build on ia64, mips* and hppa/parisc (once more closes: #642810), so remove our Debian-specific workarounds.

diff --git a/debian/confflags b/debian/confflags
index dfce132..bb019e8 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -105,9 +105,8 @@ endif
 
 # MIPS upstream arch, mips and mipsel Debian arches; no upstream flags by
 # default
-ifneq (,$(filter mips mipsel,$(DEB_HOST_GNU_CPU)))
-shared_confflags += --enable-pic
-endif
+#ifneq (,$(filter mips mipsel,$(DEB_HOST_GNU_CPU)))
+#endif
 
 # ARM upsteam arch, arm, armeb, and armel Debian arches; upstream prepends -O3
 # -fno-fast-math by default, but that's ok as we override -O and we don't care
@@ -139,11 +138,8 @@ endif
 #endif
 
 # IA64 upstream arch, ia64 Debian arch; no upstream flags by default
-# XXX upstream: --enable-pic is a workaround until the patches to set PIC by
-# default on IA64 get merged
-ifeq (ia64,$(DEB_HOST_GNU_CPU))
-shared_confflags += --enable-pic
-endif
+#ifeq (ia64,$(DEB_HOST_GNU_CPU))
+#endif
 
 # there's no special handling for other arches upstream, except for PARISC
 # which is not supported in Debian and for which there's no upstream flags by

-- 
x264 packaging