From e566799a780e78636dbb5c35a164bca14659052d Mon Sep 17 00:00:00 2001 From: Giovanni Panozzo Date: Wed, 29 Jul 2020 07:52:04 +0200 Subject: Workaround for buggy gcc on armhf/bionic --- debian/rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index f97e2c6..f254b13 100755 --- a/debian/rules +++ b/debian/rules @@ -12,11 +12,6 @@ WITH_NEON = -DWITH_NEON=OFF else WITH_NEON = endif -ifeq (,$(filter armhf,$(DEB_HOST_ARCH))) - BTYPE = -DCMAKE_BUILD_TYPE=DEBUG -else - BTYPE = -DCMAKE_BUILD_TYPE=RELWITHDEBINFO -endif DEB_HOST_ARCH_OS?=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS) ifeq (,$(filter linux, $(DEB_HOST_ARCH_OS))) @@ -57,7 +52,7 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-archit $(LINUX_URBDRC_CLIENT) \ -DWITH_SERVER=ON \ -DBUILD_TESTING=OFF \ - $(BTYPE) \ + -DCMAKE_BUILD_TYPE=RELWITHDEBINFO \ $(WITH_WAYLAND) \ $(WITH_LIBSYSTEMD) \ -DWITH_CLIENT_INTERFACE=OFF \ @@ -67,6 +62,11 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-archit # Add FFmpeg and GSM support to Ubuntu DEB_CMAKE_EXTRA_FLAGS += -DWITH_FFMPEG=ON -DWITH_GSM=ON +# gcc on ubuntu 18.04 armhf is bugged when using -O2. Replace with -O1 +ifneq (,$(filter armhf,$(DEB_HOST_ARCH))) +DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_C_FLAGS="-O1 -g" +endif + %: dh $@ -- cgit v1.2.3