From 58d5cc4105c6341678da6bb7fa8ca5935a5581c2 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Tue, 9 Oct 2018 07:13:52 -0300
Subject: [PATCH] build-style/meson: enable b_ndebug and be explicit about
 paths used.

---
 common/build-style/meson.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh
index 2a0c6817f18..b2f978bbd80 100644
--- a/common/build-style/meson.sh
+++ b/common/build-style/meson.sh
@@ -81,7 +81,25 @@ EOF
 	# https://github.com/mesonbuild/meson/issues/1646
 	export AR="gcc-ar"
 
-	${meson_cmd} --prefix=/usr -Db_lto=true --buildtype=plain ${configure_args} . ${meson_builddir}
+	${meson_cmd} \
+		--prefix=/usr \
+		--libdir=/usr/lib \
+		--libexecdir=/usr/libexec \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--includedir=/usr/include \
+		--datadir=/usr/share \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localedir=/usr/share/locale \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sharedstatedir=/var/lib \
+		--buildtype=plain \
+		--auto-features=enabled \
+		--wrap-mode=nodownload \
+		-Db_lto=true -Db_ndebug=true \
+		${configure_args} . ${meson_builddir}
 }
 
 do_build() {