From dd2843cf8752d26575b15cd1ba73c43bd3501494 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Dec 2016 11:59:52 +0100 Subject: [PATCH 1/2] rpm: use meson's syntax to specify sourcedir and builddir When user uses %meson -Denable_cool_feature=true current macro fails because RPM adds flag after popd: ... pushd x86_64-redhat-linux-gnu /usr/bin/meson ... $OLDPWD/. popd -Denable_cool_feature Since meson can accept $srcdir and $builddir arugments we don't have this problem with pushd/popd. It also simplifies things a bit. Reported-by: Richard Hughes References: https://bugzilla.redhat.com/show_bug.cgi?id=1401062 Signed-off-by: Igor Gnatenko (cherry picked from commit dcd3c217121fbb09be8acecd2d866219e85ad9bd) --- data/macros.meson | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/data/macros.meson b/data/macros.meson index 4b91c70d..1512a6bf 100644 --- a/data/macros.meson +++ b/data/macros.meson @@ -8,21 +8,19 @@ export FFLAGS="%{optflags} -I%{_fmoddir}" \ export FCFLAGS="%{optflags} -I%{_fmoddir}" \ export LDFLAGS="%{?__global_ldflags}" \ - mkdir -p %{__builddir} \ - pushd %{__builddir} \ - %{__meson} \\\ - --buildtype=plain \\\ - --prefix=%{_prefix} \\\ - --libdir=%{_libdir} \\\ - --libexecdir=%{_libexecdir} \\\ - --bindir=%{_bindir} \\\ - --includedir=%{_includedir} \\\ - --datadir=%{_datadir} \\\ - --mandir=%{_mandir} \\\ - --localedir=%{_datadir}/locale \\\ - --sysconfdir=%{_sysconfdir} \\\ - $OLDPWD/%{__sourcedir} \ - popd + %{__meson} \\\ + --buildtype=plain \\\ + --prefix=%{_prefix} \\\ + --libdir=%{_libdir} \\\ + --libexecdir=%{_libexecdir} \\\ + --bindir=%{_bindir} \\\ + --includedir=%{_includedir} \\\ + --datadir=%{_datadir} \\\ + --mandir=%{_mandir} \\\ + --localedir=%{_datadir}/locale \\\ + --sysconfdir=%{_sysconfdir} \\\ + %{__sourcedir} %{__builddir} \\\ + %{nil} %meson_build \ %ninja_build -C %{__builddir} -- 2.11.0