Hi, On Mon, Jun 05, 2017 at 12:07:48AM +0300, Adrian Bunk wrote: > --- qtwebengine-opensource-src-5.7.1+dfsg/debian/rules 2017-01-18 > 20:00:38.000000000 +0200 > +++ qtwebengine-opensource-src-5.7.1+dfsg/debian/rules 2017-06-04 > 22:12:35.000000000 +0300 > @@ -6,16 +6,22 @@ > export NINJAFLAGS=-v > include /usr/share/dpkg/default.mk > > -export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell > dpkg-buildflags --get CPPFLAGS) > -export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell > dpkg-buildflags --get CPPFLAGS) > +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) > +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) > + > +# TODO: properly integrate with the other debug setting for buster > +ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf i386 mips mipsel)) > + export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell > dpkg-buildflags --get CPPFLAGS) -g1 > + export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell > dpkg-buildflags --get CPPFLAGS) -g1 > +else > + export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell > dpkg-buildflags --get CPPFLAGS) > + export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell > dpkg-buildflags --get CPPFLAGS) > +endif > export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed > export QT_SELECT := qt5 > > VERSION_CLEAN_UPSTREAM = $(call dpkg_late_eval,VERSION_CLEAN_UPSTREAM,echo > '$(DEB_VERSION_UPSTREAM)' | sed -e 's/\(~\|+\).*//') > > -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) > -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) > - > gstab_architectures := > fulldebug_architectures := > disabled_jit_architectures := armel mips mipsel
This looks unnecessarily ugly to me (or I miss something). Why not use dpkg-buildflags' mechanism for this? See e.g. https://anonscm.debian.org/cgit/pkg-openoffice/libreoffice.git/tree/rules#n878: ifeq "$(ENABLE_SYMBOLS)" "y" # Small symbols? ifeq "$(SMALL_SYMBOLS)" "y" CONFIGURE_FLAGS += --enable-symbols=SMALL DEB_CFLAGS_MAINT_STRIP := -g DEB_CXXFLAGS_MAINT_STRIP := -g DEB_CFLAGS_MAINT_PREPEND += -g1 DEB_CXXFLAGS_MAINT_PREPEND += -g1 export DEB_CFLAGS_MAINT_STRIP DEB_CXXFLAGS_MAINT_STRIP export DEB_CFLAGS_MAINT_PREPEND DEB_CXXFLAGS_MAINT_PREPEND else CONFIGURE_FLAGS += --enable-symbols endif endif export DPKG_EXPORT_BUILDFLAGS=y include /usr/share/dpkg/buildflags.mk In this case maybe _APPEND -g1 (if you don't do the _STRIP) Regards, Rene
