From b60f67017d6a74092a99d0b6c237451aa0789090 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Oct 2017 15:55:33 +0200 Subject: [PATCH] debian/rules: Improve fix for build support on armel. Thanks to Adrian Bunk. (Closes: #874164). --- debian/rules | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index 3aa71da..bd40883 100755 --- a/debian/rules +++ b/debian/rules @@ -7,15 +7,10 @@ CFLAGS+=$(CPPFLAGS) CXXFLAGS+=$(CPPFLAGS) DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) -ifneq (,$(filter armhf,$(DEB_HOST_ARCH))) -ARM_FLOAT_ABI = -DARM_FP_ABI=hard -else -ARM_FLOAT_ABI = -endif ifneq (,$(filter armel,$(DEB_HOST_ARCH))) -ARM_FLOAT_ABI = -DARM_FP_ABI=hard -DWITH_NEON=off +WITH_NEON = -DWITH_NEON=OFF else -ARM_FLOAT_ABI = +WITH_NEON = endif NULL = @@ -49,7 +44,7 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-archit -DCMAKE_BUILD_TYPE=RELWITHDEBINFO \ -DWITH_WAYLAND=ON \ -DWITH_CLIENT_INTERFACE=OFF \ - $(ARM_FLOAT_ABI) \ + $(WITH_NEON) \ $(NULL) %: dh $@ --parallel