3a5d359b36
Update to 0.44.0 OBS-URL: https://build.opensuse.org/request/show/573229 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=72
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
Index: meson-0.44.0/data/macros.meson
|
|
===================================================================
|
|
--- meson-0.44.0.orig/data/macros.meson
|
|
+++ meson-0.44.0/data/macros.meson
|
|
@@ -1,12 +1,14 @@
|
|
%__meson %{_bindir}/meson
|
|
%__meson_wrap_mode nodownload
|
|
+%_vpath_srcdir .
|
|
+%_vpath_builddir build
|
|
|
|
%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 LANG=C.UTF-8 \
|
|
+ export CFLAGS="${CFLAGS:-%optflags}" \
|
|
+ export CXXFLAGS="${CXXFLAGS:-%optflags}" \
|
|
+ export FFLAGS="${FFLAGS:-%optflags}" \
|
|
+ export FCFLAGS="${FCFLAGS:-%optflags}" \
|
|
%{__meson} \\\
|
|
--buildtype=plain \\\
|
|
--prefix=%{_prefix} \\\
|
|
@@ -27,12 +29,15 @@
|
|
%{nil}
|
|
|
|
%meson_build \
|
|
+ export LANG=C.UTF-8 \
|
|
%ninja_build -C %{_vpath_builddir}
|
|
|
|
%meson_install \
|
|
+ export LANG=C.UTF-8 \
|
|
%ninja_install -C %{_vpath_builddir}
|
|
|
|
%meson_test \
|
|
+ export LANG=C.UTF-8 \
|
|
%ninja_test -C %{_vpath_builddir} || \
|
|
{ rc=$?; \
|
|
echo "-----BEGIN TESTLOG-----"; \
|