diff options
| author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2016-10-08 16:54:03 +0200 |
|---|---|---|
| committer | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2016-10-08 17:12:20 +0200 |
| commit | 0d58ddd739c1d7f8c0e6e49b721dd3df965167c0 (patch) | |
| tree | 0020b8dd40e814546a5a3eb59d6129b01b5351e5 /data | |
| parent | 6c50253645dad81afbfd2e1bca2c5d9e08f42e05 (diff) | |
| download | meson-0d58ddd739c1d7f8c0e6e49b721dd3df965167c0.zip meson-0d58ddd739c1d7f8c0e6e49b721dd3df965167c0.tar.gz meson-0d58ddd739c1d7f8c0e6e49b721dd3df965167c0.tar.bz2 | |
rpm: couple of improvements and fixes
* Don't hardcode /usr/bin, use %{_bindir}
* Implement %meson_build / %meson_install / %meson_test
* Automatic handling of out-of-tree builds
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Diffstat (limited to 'data')
| -rw-r--r-- | data/macros.meson | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/data/macros.meson b/data/macros.meson index c89854b..05ff484 100644 --- a/data/macros.meson +++ b/data/macros.meson @@ -1,21 +1,29 @@ -%__meson /usr/bin/meson +%__meson %{_bindir}/meson +%__sourcedir . +%__builddir %{_target_platform} +%__meson_ninja_opts -v %{?_smp_mflags} -C %{__builddir} -%meson() %{expand:\ - export CFLAGS="%{optflags}" ; \ - export CXXFLAGS="%{optflags}" ; \ - export FFLAGS="%{optflags} -I%{_fmoddir}" ; \ - export FCFLAGS="%{optflags} -I%{_fmoddir}" ; \ - export LDFLAGS="%{__global_ldflags}" ; \ - %__meson %{?1} \\\ - --prefix=%{_prefix} \\\ - --libdir=%{_libdir} \\\ - --libexecdir=%{_libexecdir} \\\ - --bindir=%{_bindir} \\\ - --includedir=%{_includedir} \\\ - --datadir=%{_datadir} \\\ - --mandir=%{_mandir} \\\ - --localedir=%{_datadir}/locale \\\ - --sysconfdir=%{_sysconfdir} \\\ - --buildtype=plain \ - %{nil} \ -} +%meson \ + export CFLAGS="%{optflags}" \ + export CXXFLAGS="%{optflags}" \ + 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_build %ninja_build -C %{__builddir} +%meson_install %ninja_install -C %{__builddir} +%meson_test %ninja_test -C %{__builddir} |