OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=182

meson-suse-ify-macros.patch

@@ -1,14 +1,12 @@
-Index: meson-0.55.0/data/macros.meson
-===================================================================
---- meson-0.55.0.orig/data/macros.meson
-+++ meson-0.55.0/data/macros.meson
+--- a/data/macros.meson
++++ b/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                      \
@@ -19,26 +17,30 @@ Index: meson-0.55.0/data/macros.meson
      %{shrink:%{__meson} \
          --buildtype=plain \
          --prefix=%{_prefix} \
-@@ -25,6 +31,7 @@
+@@ -25,21 +31,24 @@
          %{nil}}
-
+ 
  %meson_build \
 +    export LANG=C.UTF-8 \
      %{shrink:%{__meson} compile \
          -C %{_vpath_builddir} \
-         -j %{_smp_build_ncpus} \
-@@ -32,12 +39,14 @@
+-        -j %{_smp_build_ncpus} \
++        %{?_smp_mflags} \
+         --verbose \
          %{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} \
+-        --num-processes %{_smp_build_ncpus} \
++        %{?jobs:--num-processes %{jobs}} \
+         --print-errorlogs \
+         %{nil}}

meson.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jul 26 15:59:52 UTC 2020 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Remove %_smp_build_ncpus in meson-suse-ify-macros.patch.
+
 -------------------------------------------------------------------
 Wed Jul 22 17:51:19 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>