Dominique Leuenberger
a6d426ee78
- Update to version 0.55.0 + rpath removal now more careful + Added ability to specify targets in `meson compile` + Added test protocol for gtest + meson.add_*_script methods accept new types + Native and cross files now support string and list concatenation + Ability to configure CMake subprojects with meson.subproject_options + find_program: Fixes when the program has been overridden by executable + Response files enabled on Linux + `unstable-kconfig` module renamed to `unstable-keyval` + Config tool based dependencies no longer search PATH for cross compiling + String concatenation in meson_options.txt + Clang coverage support + Implicit dependency fallback + Added ability to specify backend arguments in `meson compile` - Removed meson-fix-gnome-test.patch: contained in upstream - Changed meson-suse-ify-macros.patch: to be compatible with new version OBS-URL: https://build.opensuse.org/request/show/821061 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=179
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
Index: meson-0.55.0/data/macros.meson
|
|
===================================================================
|
|
--- meson-0.55.0.orig/data/macros.meson
|
|
+++ meson-0.55.0/data/macros.meson
|
|
@@ -1,9 +1,15 @@
|
|
%__meson %{_bindir}/meson
|
|
%__meson_wrap_mode nodownload
|
|
%__meson_auto_features enabled
|
|
+%_vpath_srcdir .
|
|
+%_vpath_builddir build
|
|
|
|
%meson \
|
|
- %set_build_flags \
|
|
+ export LANG=C.UTF-8 \
|
|
+ export CFLAGS="${CFLAGS:-%optflags}" \
|
|
+ export CXXFLAGS="${CXXFLAGS:-%optflags}" \
|
|
+ export FFLAGS="${FFLAGS:-%optflags}" \
|
|
+ export FCFLAGS="${FCFLAGS:-%optflags}" \
|
|
%{shrink:%{__meson} \
|
|
--buildtype=plain \
|
|
--prefix=%{_prefix} \
|
|
@@ -25,6 +31,7 @@
|
|
%{nil}}
|
|
|
|
%meson_build \
|
|
+ export LANG=C.UTF-8 \
|
|
%{shrink:%{__meson} compile \
|
|
-C %{_vpath_builddir} \
|
|
-j %{_smp_build_ncpus} \
|
|
@@ -32,12 +39,14 @@
|
|
%{nil}}
|
|
|
|
%meson_install \
|
|
+ export LANG=C.UTF-8 \
|
|
%{shrink:DESTDIR=%{buildroot} %{__meson} install \
|
|
-C %{_vpath_builddir} \
|
|
--no-rebuild \
|
|
%{nil}}
|
|
|
|
%meson_test \
|
|
+ export LANG=C.UTF-8 \
|
|
%{shrink:%{__meson} test \
|
|
-C %{_vpath_builddir} \
|
|
--num-processes %{_smp_build_ncpus} \
|