From: Darrick J. Wong Date: Wed, 18 May 2022 02:48:07 +0000 (-0400) Subject: debian: refactor common options X-Git-Tag: v5.18.0-rc1~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9d09df8acbce83fdc735cb64992f76e1a7bf676;p=thirdparty%2Fxfsprogs-dev.git debian: refactor common options Don't respecify identical configure options; move them into the configure_options variable. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Eric Sandeen --- diff --git a/debian/rules b/debian/rules index 6d5b82a87..df023c651 100755 --- a/debian/rules +++ b/debian/rules @@ -26,13 +26,19 @@ pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT; pkgdi = DIST_ROOT=`pwd`/$(dirdi); export DIST_ROOT; stdenv = @GZIP=-q; export GZIP; -configure_options = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +configure_options = \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_HOST_GNU_TYPE) \ + --disable-ubsan \ + --disable-addrsan \ + --disable-threadsan \ + --enable-lto options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \ INSTALL_USER=root INSTALL_GROUP=root \ - LOCAL_CONFIGURE_OPTIONS="$(configure_options) --enable-editline=yes --enable-blkid=yes --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ; + LOCAL_CONFIGURE_OPTIONS="$(configure_options) --enable-editline=yes --enable-blkid=yes" ; diopts = $(options) \ - export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="$(configure_options) --enable-gettext=no --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ; + export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="$(configure_options) --enable-gettext=no" ; checkdir = test -f debian/rules build: build-arch build-indep