Imported Debian patch 1.4+222+hg5f9f7194267b-1~trusty

[deb_x265.git] / debian / confflags

diff --git a/debian/confflags b/debian/confflags
index 714d8c1f3d723d17117e47c68587b01193f2b3b8..6ae0f499c5eaa4f8a2d1f120750902d20aafd3ec 100644 (file)
--- a/debian/confflags
+++ b/debian/confflags
@@ -1,28 +1,37 @@
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+CFLAGS   := -O3 $(filter-out -g -O2,$(shell dpkg-buildflags --get CFLAGS)) $(CPPFLAGS)
+CXXFLAGS := -O3 $(filter-out -g -O2,$(shell dpkg-buildflags --get CXXFLAGS)) $(CPPFLAGS)
+
 libdir := lib/$(DEB_HOST_MULTIARCH)
 
 
-common_confflags := \
+common_confflags += \
        -DCMAKE_INSTALL_PREFIX=/usr \
-       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DCMAKE_VERBOSE_MAKEFILE=ON
 
-8bit_confflags := \
+
+shared_confflags := \
        $(common_confflags) \
+       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+       -DENABLE_PIC=ON
+
+8bit_confflags := \
+       $(shared_confflags) \
        -DLIB_INSTALL_DIR=$(libdir)
 
 10bit_confflags := \
-       $(common_confflags) \
+       $(shared_confflags) \
        -DBIN_INSTALL_DIR=$(libdir)/x265-10bit \
        -DLIB_INSTALL_DIR=$(libdir)/x265-10bit \
        -DHIGH_BIT_DEPTH=ON
 
 
 static_confflags := \
-       -DCMAKE_INSTALL_PREFIX=/usr \
+       $(common_confflags) \
        -DCMAKE_BUILD_TYPE=Release \
-       -DCMAKE_VERBOSE_MAKEFILE=ON \
-       -DENABLE_CLI=OFF \
-       -DENABLE_SHARED=OFF
+       -DENABLE_SHARED=OFF \
+       -DENABLE_PIC=OFF
 
 8bit_static_confflags  := \
        $(static_confflags) \
@@ -33,13 +42,3 @@ static_confflags := \
        -DLIB_INSTALL_DIR=$(libdir)/x265-10bit \
        -DHIGH_BIT_DEPTH=ON
 
-
-# disable assembly on x86 and arm
-ifneq (,$(filter i386 i486 i586 i686 pentium arm,$(DEB_HOST_GNU_CPU)))
-noasm = -DENABLE_ASSEMBLY=OFF -DCMAKE_CXX_FLAGS='-DX86_64=0'
-8bit_confflags  += $(noasm)
-10bit_confflags += $(noasm)
-8bit_static_confflags  += $(noasm)
-10bit_static_confflags += $(noasm)
-endif
-