debian/rules: ignore warnings in armhf and ppc64el

 And cleanup a bit (bzr r4253.2.1)

1 files changed, 11 insertions, 9 deletions

diff --git a/debian/rules b/debian/rules
index 5f4d89837..b20031320 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,15 +6,10 @@
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 gles2_architectures := armel armhf
+ignore_warnings_archs := armhf ppc64el
 
 DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 
-# avoid template instance removal (lp:1286284)
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), ppc64el))
- export DEB_CXXFLAGS_MAINT_STRIP=-O3
- export DEB_CXXFLAGS_MAINT_APPEND=-O2
-endif
-
 # http://ccache.samba.org/manual.html#_precompiled_headers
 CCACHE_SLOPPINESS=time_macros
 
@@ -23,13 +18,20 @@ NUX_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+NUX_ABIVERSION[[:space
 LIBUNITY_PRIVATE := $(shell pkg-config --libs-only-L unity-protocol-private | sed -e 's/-L\(.*\)/\1/' )
 SCOPES_RECOMMENDS := $(shell perl debian/scopes-recommends-generator /usr/share/unity/client-scopes.json)
 
-cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
+cmake_options := -DCOMPIZ_BUILD_WITH_RPATH=FALSE \
+ -DCOMPIZ_PACKAGING_ENABLED=TRUE \
+ -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
+
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
- cmake_gl_options := -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
+ cmake_options += -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CXXFLAGS=ON
+endif
+
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(ignore_warnings_archs)))
+ cmake_options += -DDISABLE_MAINTAINER_CXXFLAGS=ON
 endif
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(cmake_base_options) $(cmake_gl_options) $(cmake_pch_options)
+	dh_auto_configure -- $(cmake_options)
 
 override_dh_install:
	# install autopilot tests