meson/meson-0.45.1-rpm-macros.path

43 lines
1.5 KiB
SYSTEMD
Raw Normal View History

diff -Nru meson-0.45.1.orig/data/macros.meson meson-0.45.1/data/macros.meson
--- meson-0.45.1.orig/data/macros.meson 2018-03-22 15:23:16.000000000 +0100
+++ meson-0.45.1/data/macros.meson 2018-04-15 08:13:43.129362331 +0200
@@ -2,11 +2,11 @@
%__meson_wrap_mode nodownload
%meson \
- export CFLAGS="${CFLAGS:-%__global_cflags}" \
- export CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \
- export FFLAGS="${FFLAGS:-%__global_fflags}" \
- export FCFLAGS="${FCFLAGS:-%__global_fcflags}" \
- export LDFLAGS="${LDFLAGS:-%__global_ldflags}" \
+ export CFLAGS="${CFLAGS:-%optflags}" \
+ export CXXFLAGS="${CXXFLAGS:-%optflags}" \
+ export FFLAGS="${FFLAGS:-%optflags}" \
+ export FCFLAGS="${FCFLAGS}" \
+ export LDFLAGS="${LDFLAGS}" \
%{__meson} \\\
--buildtype=plain \\\
--prefix=%{_prefix} \\\
@@ -23,17 +23,17 @@
--localstatedir=%{_localstatedir} \\\
--sharedstatedir=%{_sharedstatedir} \\\
--wrap-mode=%{__meson_wrap_mode} \\\
- %{_vpath_srcdir} %{_vpath_builddir} \\\
+ . build \\\
%{nil}
%meson_build \
- %ninja_build -C %{_vpath_builddir}
+ ninja -C build
%meson_install \
- %ninja_install -C %{_vpath_builddir}
+ ninja install -C build
%meson_test \
- %ninja_test -C %{_vpath_builddir} || \
+ ninja test -C build || \
( rc=$?; \
echo "-----BEGIN TESTLOG-----"; \
cat %{_vpath_builddir}/meson-logs/testlog.txt; \