From 6fe0e3ea0dcfbb4d5106e3230a6b57fec662c012 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Sat, 14 Mar 2020 14:43:48 +0100 Subject: [PATCH 01/11] Update to 88e40c7081b9bf8a337022ad2f12efe485fa8021 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backporting just the fixes for https://bugzilla.redhat.com/show_bug.cgi?id=1813529 is bound to cause more trouble than it’s worth, so we’re going all out. --- meson.spec | 14 ++++++++++---- sources | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/meson.spec b/meson.spec index aead30d..791af61 100644 --- a/meson.spec +++ b/meson.spec @@ -5,14 +5,17 @@ # — ekulik %bcond_with check +%global commit 88e40c7081b9bf8a337022ad2f12efe485fa8021 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: meson -Version: 0.53.1 -Release: 1%{?dist} +Version: 0.53.2 +Release: 1.git%{shortcommit}%{?dist} Summary: High productivity build system License: ASL 2.0 URL: https://mesonbuild.com/ -Source: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz +Source: https://github.com/mesonbuild/meson/archive/%{commit}/%{name}-%{shortcommit}.tar.gz BuildArch: noarch Obsoletes: %{name}-gui < 0.31.0-3 @@ -79,7 +82,7 @@ support for modern software development tools and practices, such as unit tests, coverage reports, Valgrind, CCache and the like. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{commit} # Macro should not change when we are redefining bindir sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name} @@ -112,6 +115,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Sat Mar 14 2020 - Ernestas Kulik - 0.53.2-1.git88e40c7 +- Update to snapshot of 0.53.2 with D fixes + * Fri Feb 07 2020 - Ernestas Kulik - 0.53.1-1 - Update to 0.53.1 diff --git a/sources b/sources index 67d3be3..1c0b1d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (meson-0.53.1.tar.gz) = 116218a4d290ac9556b4779c9377106f494be82fbadb18a9024077aa106ac1e36a66d755ea9fda679c3b8c34d84c0f0715500319b14d0f169e02309b3612c6e3 +SHA512 (meson-88e40c7.tar.gz) = 206492ed77a5e382565f0e0a50ab13955be42b665f144e5879232560a64539c0762062028a021aad6cf2d9fb49b7f39c9e572f6a280628cbeeef35da0dd9ea56 From c0422478ecadd6f5e7b290a3211285f1c5dec2fb Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Mon, 30 Mar 2020 15:29:02 +0200 Subject: [PATCH 02/11] Update to 0.54.0 --- meson.spec | 14 +++++++------- sources | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meson.spec b/meson.spec index 791af61..af5e65b 100644 --- a/meson.spec +++ b/meson.spec @@ -5,17 +5,14 @@ # — ekulik %bcond_with check -%global commit 88e40c7081b9bf8a337022ad2f12efe485fa8021 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: meson -Version: 0.53.2 -Release: 1.git%{shortcommit}%{?dist} +Version: 0.54.0 +Release: 1%{?dist} Summary: High productivity build system License: ASL 2.0 URL: https://mesonbuild.com/ -Source: https://github.com/mesonbuild/meson/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch Obsoletes: %{name}-gui < 0.31.0-3 @@ -82,7 +79,7 @@ support for modern software development tools and practices, such as unit tests, coverage reports, Valgrind, CCache and the like. %prep -%autosetup -p1 -n %{name}-%{commit} +%autosetup -p1 # Macro should not change when we are redefining bindir sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name} @@ -115,6 +112,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Mon Mar 30 2020 - Ernestas Kulik - 0.54.0-1 +- Update to 0.54.0 + * Sat Mar 14 2020 - Ernestas Kulik - 0.53.2-1.git88e40c7 - Update to snapshot of 0.53.2 with D fixes diff --git a/sources b/sources index 1c0b1d2..5ab8ed6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (meson-88e40c7.tar.gz) = 206492ed77a5e382565f0e0a50ab13955be42b665f144e5879232560a64539c0762062028a021aad6cf2d9fb49b7f39c9e572f6a280628cbeeef35da0dd9ea56 +SHA512 (meson-0.54.0.tar.gz) = 5e4296c9df175cc9b018308bdfdf93cdc43e71b57d840c82c8b71adfee7b101d0c1811ed866da079790315a029dfa39bb87e41d5fababefdadc54f12e82262f6 From 7e361517feb0790d0d96b1405bfea3154a2b44bc Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Thu, 7 May 2020 09:11:08 +0200 Subject: [PATCH 03/11] Update to 0.54.1 Signed-off-by: Igor Raits --- meson.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meson.spec b/meson.spec index af5e65b..563dfd6 100644 --- a/meson.spec +++ b/meson.spec @@ -6,7 +6,7 @@ %bcond_with check Name: meson -Version: 0.54.0 +Version: 0.54.1 Release: 1%{?dist} Summary: High productivity build system @@ -112,6 +112,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Thu May 07 2020 Igor Raits - 0.54.1-1 +- Update to 0.54.1 + * Mon Mar 30 2020 - Ernestas Kulik - 0.54.0-1 - Update to 0.54.0 diff --git a/sources b/sources index 5ab8ed6..9b3e244 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (meson-0.54.0.tar.gz) = 5e4296c9df175cc9b018308bdfdf93cdc43e71b57d840c82c8b71adfee7b101d0c1811ed866da079790315a029dfa39bb87e41d5fababefdadc54f12e82262f6 +SHA512 (meson-0.54.1.tar.gz) = 5f2b802ca61183a5c9c69e540d2c6a7a905f0707830868d892eb34c2e34ea6481d58bac27c75b7651b7070c3991a3342d3e3f055343feb638760a35228f3b6a4 From 569407580b74e9eda7d5e8c26c80195b3876d0c2 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 15 May 2020 12:41:54 +0200 Subject: [PATCH 04/11] Update to 0.54.2 --- meson.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meson.spec b/meson.spec index 563dfd6..d8f801d 100644 --- a/meson.spec +++ b/meson.spec @@ -6,7 +6,7 @@ %bcond_with check Name: meson -Version: 0.54.1 +Version: 0.54.2 Release: 1%{?dist} Summary: High productivity build system @@ -112,6 +112,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Fri May 15 2020 Kalev Lember - 0.54.2-1 +- Update to 0.54.2 + * Thu May 07 2020 Igor Raits - 0.54.1-1 - Update to 0.54.1 diff --git a/sources b/sources index 9b3e244..73b1c78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (meson-0.54.1.tar.gz) = 5f2b802ca61183a5c9c69e540d2c6a7a905f0707830868d892eb34c2e34ea6481d58bac27c75b7651b7070c3991a3342d3e3f055343feb638760a35228f3b6a4 +SHA512 (meson-0.54.2.tar.gz) = 1fdb79ab53cbe88769d94e317b7daf9941210ca551b417d2bcf32555ef4f1d59d0aeb7e89a47d72091688ee4ad1dec1a85825de10df77fd1cf43fbad268bd813 From 685f34786342bc320bae0224f305b24d171d3e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 22 May 2020 23:34:54 +0200 Subject: [PATCH 05/11] Rebuilt for Python 3.9 --- meson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.spec b/meson.spec index d8f801d..f0aff90 100644 --- a/meson.spec +++ b/meson.spec @@ -7,7 +7,7 @@ Name: meson Version: 0.54.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High productivity build system License: ASL 2.0 @@ -112,6 +112,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Fri May 22 2020 Miro Hrončok - 0.54.2-2 +- Rebuilt for Python 3.9 + * Fri May 15 2020 Kalev Lember - 0.54.2-1 - Update to 0.54.2 From 7692299e7436dc4e919deb7075e374553edd5b2c Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mon, 15 Jun 2020 19:55:06 +0200 Subject: [PATCH 06/11] Switch to meson compile / meson install Signed-off-by: Igor Raits --- ...ros.meson-Switch-to-_smp_build_ncpus.patch | 44 +++++++++++++++++++ ...eson-Switch-to-meson-compile-install.patch | 40 +++++++++++++++++ meson.spec | 10 ++++- 3 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 0001-macros.meson-Switch-to-_smp_build_ncpus.patch create mode 100644 0002-macros.meson-Switch-to-meson-compile-install.patch diff --git a/0001-macros.meson-Switch-to-_smp_build_ncpus.patch b/0001-macros.meson-Switch-to-_smp_build_ncpus.patch new file mode 100644 index 0000000..bdc16e6 --- /dev/null +++ b/0001-macros.meson-Switch-to-_smp_build_ncpus.patch @@ -0,0 +1,44 @@ +From bfb0e8e4de740c07742c7df217b32fdbf2c92536 Mon Sep 17 00:00:00 2001 +From: Igor Raits +Date: Mon, 15 Jun 2020 19:33:52 +0200 +Subject: [PATCH 1/2] macros.meson: Switch to %{_smp_build_ncpus} + +It is available since RPM 4.15 which has been around 1 year by now. + +Signed-off-by: Igor Raits +--- + data/macros.meson | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git a/data/macros.meson b/data/macros.meson +index c5b90de03..25601aad3 100644 +--- a/data/macros.meson ++++ b/data/macros.meson +@@ -2,12 +2,6 @@ + %__meson_wrap_mode nodownload + %__meson_auto_features enabled + +-%_smp_mesonflags %([ -z "$MESON_BUILD_NCPUS" ] \\\ +- && MESON_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\ +- ncpus_max=%{?_smp_ncpus_max}; \\\ +- if [ -n "$ncpus_max" ] && [ "$ncpus_max" -gt 0 ] && [ "$MESON_BUILD_NCPUS" -gt "$ncpus_max" ]; then MESON_BUILD_NCPUS="$ncpus_max"; fi; \\\ +- if [ "$MESON_BUILD_NCPUS" -gt 1 ]; then echo "--num-processes $MESON_BUILD_NCPUS"; fi) +- + %meson \ + %set_build_flags \ + %{shrink:%{__meson} \ +@@ -37,8 +31,8 @@ + %ninja_install -C %{_vpath_builddir} + + %meson_test \ +- %{shrink: %{__meson} test \ ++ %{shrink:%{__meson} test \ + -C %{_vpath_builddir} \ +- %{?_smp_mesonflags} \ ++ --num-processes %{_smp_build_ncpus} \ + --print-errorlogs \ +- %{nil}} ++ %{nil}} +-- +2.27.0 + diff --git a/0002-macros.meson-Switch-to-meson-compile-install.patch b/0002-macros.meson-Switch-to-meson-compile-install.patch new file mode 100644 index 0000000..596008b --- /dev/null +++ b/0002-macros.meson-Switch-to-meson-compile-install.patch @@ -0,0 +1,40 @@ +From 9f2fa65679038c4b9a78191060a79323e827f0d2 Mon Sep 17 00:00:00 2001 +From: Igor Raits +Date: Mon, 15 Jun 2020 19:36:47 +0200 +Subject: [PATCH 2/2] macros.meson: Switch to meson compile / install + +Signed-off-by: Igor Raits +--- + data/macros.meson | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/data/macros.meson b/data/macros.meson +index 25601aad3..8a66c9657 100644 +--- a/data/macros.meson ++++ b/data/macros.meson +@@ -22,13 +22,19 @@ + --wrap-mode=%{__meson_wrap_mode} \ + --auto-features=%{__meson_auto_features} \ + %{_vpath_srcdir} %{_vpath_builddir} \ +- %{nil}} ++ %{nil}} + + %meson_build \ +- %ninja_build -C %{_vpath_builddir} ++ %{shrink:%{__meson} compile \ ++ -C %{_vpath_builddir} \ ++ -j %{_smp_build_ncpus} \ ++ %{nil}} + + %meson_install \ +- %ninja_install -C %{_vpath_builddir} ++ %{shrink:DESTDIR=%{buildroot} %{__meson} install \ ++ -C %{_vpath_builddir} \ ++ --no-rebuild \ ++ %{nil}} + + %meson_test \ + %{shrink:%{__meson} test \ +-- +2.27.0 + diff --git a/meson.spec b/meson.spec index f0aff90..f131d89 100644 --- a/meson.spec +++ b/meson.spec @@ -7,7 +7,7 @@ Name: meson Version: 0.54.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High productivity build system License: ASL 2.0 @@ -78,6 +78,11 @@ productivity. It aims to do this by providing simple, out-of-the-box support for modern software development tools and practices, such as unit tests, coverage reports, Valgrind, CCache and the like. +%patchlist +# https://github.com/mesonbuild/meson/pull/7329 +0001-macros.meson-Switch-to-_smp_build_ncpus.patch +0002-macros.meson-Switch-to-meson-compile-install.patch + %prep %autosetup -p1 # Macro should not change when we are redefining bindir @@ -112,6 +117,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Mon Jun 15 19:54:47 CEST 2020 Igor Raits - 0.54.2-3 +- Switch to meson compile / meson install + * Fri May 22 2020 Miro Hrončok - 0.54.2-2 - Rebuilt for Python 3.9 From ba969f06ccc87e87c5e690b10b5044247ca55fb0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 15 Jun 2020 20:54:56 +0200 Subject: [PATCH 07/11] Update to 0.54.3 --- meson.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meson.spec b/meson.spec index f131d89..62ac1ae 100644 --- a/meson.spec +++ b/meson.spec @@ -6,8 +6,8 @@ %bcond_with check Name: meson -Version: 0.54.2 -Release: 3%{?dist} +Version: 0.54.3 +Release: 1%{?dist} Summary: High productivity build system License: ASL 2.0 @@ -117,6 +117,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Mon Jun 15 2020 Kalev Lember - 0.54.3-1 +- Update to 0.54.3 + * Mon Jun 15 19:54:47 CEST 2020 Igor Raits - 0.54.2-3 - Switch to meson compile / meson install diff --git a/sources b/sources index 73b1c78..f137142 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (meson-0.54.2.tar.gz) = 1fdb79ab53cbe88769d94e317b7daf9941210ca551b417d2bcf32555ef4f1d59d0aeb7e89a47d72091688ee4ad1dec1a85825de10df77fd1cf43fbad268bd813 +SHA512 (meson-0.54.3.tar.gz) = 4a342728ecba101bf329a015b6be5aaab9221eaef4a96317e4eada9ec7362ad6132182eb6eecaf95192e9cd53832eeadbfa378825e0800fe1f7153de08e57ba8 From 209c74edcf08e9bd25e409e8c574d053071ae3f4 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Thu, 18 Jun 2020 19:08:31 +0200 Subject: [PATCH 08/11] Use verbose mode for meson compile Signed-off-by: Igor Raits --- ...ros.meson-Switch-to-_smp_build_ncpus.patch | 5 +- ...eson-Switch-to-meson-compile-install.patch | 5 +- 0003-mcompile-Add-verbose-mode.patch | 64 +++++++++++++++++++ meson.spec | 7 +- 4 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 0003-mcompile-Add-verbose-mode.patch diff --git a/0001-macros.meson-Switch-to-_smp_build_ncpus.patch b/0001-macros.meson-Switch-to-_smp_build_ncpus.patch index bdc16e6..0d0acef 100644 --- a/0001-macros.meson-Switch-to-_smp_build_ncpus.patch +++ b/0001-macros.meson-Switch-to-_smp_build_ncpus.patch @@ -1,11 +1,12 @@ -From bfb0e8e4de740c07742c7df217b32fdbf2c92536 Mon Sep 17 00:00:00 2001 +From 9a634850c8e2fdc56159dc6e57d4842b7c7f4e0d Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mon, 15 Jun 2020 19:33:52 +0200 -Subject: [PATCH 1/2] macros.meson: Switch to %{_smp_build_ncpus} +Subject: [PATCH 1/3] macros.meson: Switch to %{_smp_build_ncpus} It is available since RPM 4.15 which has been around 1 year by now. Signed-off-by: Igor Raits +(cherry picked from commit c4761afa634a1c3b15c1c8229cb39b3f267fd3b1) --- data/macros.meson | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/0002-macros.meson-Switch-to-meson-compile-install.patch b/0002-macros.meson-Switch-to-meson-compile-install.patch index 596008b..aafbfa5 100644 --- a/0002-macros.meson-Switch-to-meson-compile-install.patch +++ b/0002-macros.meson-Switch-to-meson-compile-install.patch @@ -1,9 +1,10 @@ -From 9f2fa65679038c4b9a78191060a79323e827f0d2 Mon Sep 17 00:00:00 2001 +From 314e5bcb7a26dec4f9eb2a5915ba2dffe3aba405 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mon, 15 Jun 2020 19:36:47 +0200 -Subject: [PATCH 2/2] macros.meson: Switch to meson compile / install +Subject: [PATCH 2/3] macros.meson: Switch to meson compile / install Signed-off-by: Igor Raits +(cherry picked from commit 0a61f511aa1960ac0d3f9b5e50e35f5f603b99b7) --- data/macros.meson | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/0003-mcompile-Add-verbose-mode.patch b/0003-mcompile-Add-verbose-mode.patch new file mode 100644 index 0000000..2389451 --- /dev/null +++ b/0003-mcompile-Add-verbose-mode.patch @@ -0,0 +1,64 @@ +From 25c1a78616ae93af61e61f7aab7cb8ca5e4fd1b1 Mon Sep 17 00:00:00 2001 +From: Igor Raits +Date: Thu, 18 Jun 2020 16:45:27 +0200 +Subject: [PATCH 3/3] mcompile: Add --verbose mode + +Closes: https://github.com/mesonbuild/meson/issues/7352 +Signed-off-by: Igor Raits +--- + data/macros.meson | 1 + + mesonbuild/mcompile.py | 11 ++++++++++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/data/macros.meson b/data/macros.meson +index 8a66c9657..cc4953c5f 100644 +--- a/data/macros.meson ++++ b/data/macros.meson +@@ -28,6 +28,7 @@ + %{shrink:%{__meson} compile \ + -C %{_vpath_builddir} \ + -j %{_smp_build_ncpus} \ ++ --verbose \ + %{nil}} + + %meson_install \ +diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py +index 7829ffc19..12048d09d 100644 +--- a/mesonbuild/mcompile.py ++++ b/mesonbuild/mcompile.py +@@ -57,6 +57,11 @@ def add_arguments(parser: 'argparse.ArgumentParser') -> None: + default='.', + help='The directory containing build files to be built.' + ) ++ parser.add_argument( ++ '--verbose', ++ action='store_true', ++ help='Show more verbose output.' ++ ) + + + def run(options: 'argparse.Namespace') -> int: +@@ -89,6 +94,8 @@ def run(options: 'argparse.Namespace') -> int: + cmd.extend(['-j', str(options.jobs)]) + if options.load_average > 0: + cmd.extend(['-l', str(options.load_average)]) ++ if options.verbose: ++ cmd.append('-v') + if options.clean: + cmd.append('clean') + +@@ -107,8 +114,10 @@ def run(options: 'argparse.Namespace') -> int: + + if options.load_average: + mlog.warning('Msbuild does not have a load-average switch, ignoring.') ++ if not options.verbose: ++ cmd.append('/v:minimal') + if options.clean: +- cmd.extend(['/t:Clean']) ++ cmd.append('/t:Clean') + + # TODO: xcode? + else: +-- +2.27.0 + diff --git a/meson.spec b/meson.spec index 62ac1ae..425b4f8 100644 --- a/meson.spec +++ b/meson.spec @@ -7,7 +7,7 @@ Name: meson Version: 0.54.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High productivity build system License: ASL 2.0 @@ -82,6 +82,8 @@ unit tests, coverage reports, Valgrind, CCache and the like. # https://github.com/mesonbuild/meson/pull/7329 0001-macros.meson-Switch-to-_smp_build_ncpus.patch 0002-macros.meson-Switch-to-meson-compile-install.patch +# https://github.com/mesonbuild/meson/pull/7353 +0003-mcompile-Add-verbose-mode.patch %prep %autosetup -p1 @@ -117,6 +119,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Thu Jun 18 2020 Igor Raits - 0.54.3-2 +- Use verbose mode for meson compile + * Mon Jun 15 2020 Kalev Lember - 0.54.3-1 - Update to 0.54.3 From 2aca549235c59a09261e8aaeeb7b283db927f0a6 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Fri, 3 Jul 2020 06:54:37 +0200 Subject: [PATCH 09/11] Update to 0.55.0rc1 Signed-off-by: Igor Raits --- ...ros.meson-Switch-to-_smp_build_ncpus.patch | 45 ------------- ...eson-Switch-to-meson-compile-install.patch | 41 ------------ 0003-mcompile-Add-verbose-mode.patch | 64 ------------------- meson.spec | 19 ++---- sources | 2 +- 5 files changed, 8 insertions(+), 163 deletions(-) delete mode 100644 0001-macros.meson-Switch-to-_smp_build_ncpus.patch delete mode 100644 0002-macros.meson-Switch-to-meson-compile-install.patch delete mode 100644 0003-mcompile-Add-verbose-mode.patch diff --git a/0001-macros.meson-Switch-to-_smp_build_ncpus.patch b/0001-macros.meson-Switch-to-_smp_build_ncpus.patch deleted file mode 100644 index 0d0acef..0000000 --- a/0001-macros.meson-Switch-to-_smp_build_ncpus.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9a634850c8e2fdc56159dc6e57d4842b7c7f4e0d Mon Sep 17 00:00:00 2001 -From: Igor Raits -Date: Mon, 15 Jun 2020 19:33:52 +0200 -Subject: [PATCH 1/3] macros.meson: Switch to %{_smp_build_ncpus} - -It is available since RPM 4.15 which has been around 1 year by now. - -Signed-off-by: Igor Raits -(cherry picked from commit c4761afa634a1c3b15c1c8229cb39b3f267fd3b1) ---- - data/macros.meson | 12 +++--------- - 1 file changed, 3 insertions(+), 9 deletions(-) - -diff --git a/data/macros.meson b/data/macros.meson -index c5b90de03..25601aad3 100644 ---- a/data/macros.meson -+++ b/data/macros.meson -@@ -2,12 +2,6 @@ - %__meson_wrap_mode nodownload - %__meson_auto_features enabled - --%_smp_mesonflags %([ -z "$MESON_BUILD_NCPUS" ] \\\ -- && MESON_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\ -- ncpus_max=%{?_smp_ncpus_max}; \\\ -- if [ -n "$ncpus_max" ] && [ "$ncpus_max" -gt 0 ] && [ "$MESON_BUILD_NCPUS" -gt "$ncpus_max" ]; then MESON_BUILD_NCPUS="$ncpus_max"; fi; \\\ -- if [ "$MESON_BUILD_NCPUS" -gt 1 ]; then echo "--num-processes $MESON_BUILD_NCPUS"; fi) -- - %meson \ - %set_build_flags \ - %{shrink:%{__meson} \ -@@ -37,8 +31,8 @@ - %ninja_install -C %{_vpath_builddir} - - %meson_test \ -- %{shrink: %{__meson} test \ -+ %{shrink:%{__meson} test \ - -C %{_vpath_builddir} \ -- %{?_smp_mesonflags} \ -+ --num-processes %{_smp_build_ncpus} \ - --print-errorlogs \ -- %{nil}} -+ %{nil}} --- -2.27.0 - diff --git a/0002-macros.meson-Switch-to-meson-compile-install.patch b/0002-macros.meson-Switch-to-meson-compile-install.patch deleted file mode 100644 index aafbfa5..0000000 --- a/0002-macros.meson-Switch-to-meson-compile-install.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 314e5bcb7a26dec4f9eb2a5915ba2dffe3aba405 Mon Sep 17 00:00:00 2001 -From: Igor Raits -Date: Mon, 15 Jun 2020 19:36:47 +0200 -Subject: [PATCH 2/3] macros.meson: Switch to meson compile / install - -Signed-off-by: Igor Raits -(cherry picked from commit 0a61f511aa1960ac0d3f9b5e50e35f5f603b99b7) ---- - data/macros.meson | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/data/macros.meson b/data/macros.meson -index 25601aad3..8a66c9657 100644 ---- a/data/macros.meson -+++ b/data/macros.meson -@@ -22,13 +22,19 @@ - --wrap-mode=%{__meson_wrap_mode} \ - --auto-features=%{__meson_auto_features} \ - %{_vpath_srcdir} %{_vpath_builddir} \ -- %{nil}} -+ %{nil}} - - %meson_build \ -- %ninja_build -C %{_vpath_builddir} -+ %{shrink:%{__meson} compile \ -+ -C %{_vpath_builddir} \ -+ -j %{_smp_build_ncpus} \ -+ %{nil}} - - %meson_install \ -- %ninja_install -C %{_vpath_builddir} -+ %{shrink:DESTDIR=%{buildroot} %{__meson} install \ -+ -C %{_vpath_builddir} \ -+ --no-rebuild \ -+ %{nil}} - - %meson_test \ - %{shrink:%{__meson} test \ --- -2.27.0 - diff --git a/0003-mcompile-Add-verbose-mode.patch b/0003-mcompile-Add-verbose-mode.patch deleted file mode 100644 index 2389451..0000000 --- a/0003-mcompile-Add-verbose-mode.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 25c1a78616ae93af61e61f7aab7cb8ca5e4fd1b1 Mon Sep 17 00:00:00 2001 -From: Igor Raits -Date: Thu, 18 Jun 2020 16:45:27 +0200 -Subject: [PATCH 3/3] mcompile: Add --verbose mode - -Closes: https://github.com/mesonbuild/meson/issues/7352 -Signed-off-by: Igor Raits ---- - data/macros.meson | 1 + - mesonbuild/mcompile.py | 11 ++++++++++- - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/data/macros.meson b/data/macros.meson -index 8a66c9657..cc4953c5f 100644 ---- a/data/macros.meson -+++ b/data/macros.meson -@@ -28,6 +28,7 @@ - %{shrink:%{__meson} compile \ - -C %{_vpath_builddir} \ - -j %{_smp_build_ncpus} \ -+ --verbose \ - %{nil}} - - %meson_install \ -diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py -index 7829ffc19..12048d09d 100644 ---- a/mesonbuild/mcompile.py -+++ b/mesonbuild/mcompile.py -@@ -57,6 +57,11 @@ def add_arguments(parser: 'argparse.ArgumentParser') -> None: - default='.', - help='The directory containing build files to be built.' - ) -+ parser.add_argument( -+ '--verbose', -+ action='store_true', -+ help='Show more verbose output.' -+ ) - - - def run(options: 'argparse.Namespace') -> int: -@@ -89,6 +94,8 @@ def run(options: 'argparse.Namespace') -> int: - cmd.extend(['-j', str(options.jobs)]) - if options.load_average > 0: - cmd.extend(['-l', str(options.load_average)]) -+ if options.verbose: -+ cmd.append('-v') - if options.clean: - cmd.append('clean') - -@@ -107,8 +114,10 @@ def run(options: 'argparse.Namespace') -> int: - - if options.load_average: - mlog.warning('Msbuild does not have a load-average switch, ignoring.') -+ if not options.verbose: -+ cmd.append('/v:minimal') - if options.clean: -- cmd.extend(['/t:Clean']) -+ cmd.append('/t:Clean') - - # TODO: xcode? - else: --- -2.27.0 - diff --git a/meson.spec b/meson.spec index 425b4f8..5ca9279 100644 --- a/meson.spec +++ b/meson.spec @@ -6,16 +6,15 @@ %bcond_with check Name: meson -Version: 0.54.3 -Release: 2%{?dist} +Version: 0.55.0~rc1 +Release: 1%{?dist} Summary: High productivity build system License: ASL 2.0 URL: https://mesonbuild.com/ -Source: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz +Source: https://github.com/mesonbuild/meson/releases/download/%{version_no_tilde .}/meson-%{version_no_tilde %{quote:}}.tar.gz BuildArch: noarch -Obsoletes: %{name}-gui < 0.31.0-3 BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -78,15 +77,8 @@ productivity. It aims to do this by providing simple, out-of-the-box support for modern software development tools and practices, such as unit tests, coverage reports, Valgrind, CCache and the like. -%patchlist -# https://github.com/mesonbuild/meson/pull/7329 -0001-macros.meson-Switch-to-_smp_build_ncpus.patch -0002-macros.meson-Switch-to-meson-compile-install.patch -# https://github.com/mesonbuild/meson/pull/7353 -0003-mcompile-Add-verbose-mode.patch - %prep -%autosetup -p1 +%autosetup -p1 -n meson-%{version_no_tilde %{quote:}} # Macro should not change when we are redefining bindir sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name} @@ -119,6 +111,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Fri Jul 03 2020 Igor Raits - 0.55.0~rc1-1 +- Update to 0.55.0rc1 + * Thu Jun 18 2020 Igor Raits - 0.54.3-2 - Use verbose mode for meson compile diff --git a/sources b/sources index f137142..0086ea1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (meson-0.54.3.tar.gz) = 4a342728ecba101bf329a015b6be5aaab9221eaef4a96317e4eada9ec7362ad6132182eb6eecaf95192e9cd53832eeadbfa378825e0800fe1f7153de08e57ba8 +SHA512 (meson-0.55.0rc1.tar.gz) = 4d86bc8b4d2996f39c578287e32c5dcbce088cfb2a67e354c0766cb8be0212bd4ce8022221d3cddfd01d271dccd1caef4bdbe604f3687bd83376b25151238d50 From 0d4b16cc382395bc1523f72d8ba258ab76993886 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mon, 6 Jul 2020 09:29:03 +0200 Subject: [PATCH 10/11] Update to 0.55.0rc2 Signed-off-by: Igor Raits --- meson.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meson.spec b/meson.spec index 5ca9279..88b8b39 100644 --- a/meson.spec +++ b/meson.spec @@ -6,7 +6,7 @@ %bcond_with check Name: meson -Version: 0.55.0~rc1 +Version: 0.55.0~rc2 Release: 1%{?dist} Summary: High productivity build system @@ -111,6 +111,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Mon Jul 06 2020 Igor Raits - 0.55.0~rc2-1 +- Update to 0.55.0rc2 + * Fri Jul 03 2020 Igor Raits - 0.55.0~rc1-1 - Update to 0.55.0rc1 diff --git a/sources b/sources index 0086ea1..ece4e2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (meson-0.55.0rc1.tar.gz) = 4d86bc8b4d2996f39c578287e32c5dcbce088cfb2a67e354c0766cb8be0212bd4ce8022221d3cddfd01d271dccd1caef4bdbe604f3687bd83376b25151238d50 +SHA512 (meson-0.55.0rc2.tar.gz) = 570fb808ec20738c27658fa9357068641bd2e778bc4609ca178a448e1447695d45d596a696343a4fdfec0fa79737ffb490dd83cc817d94dec2cdf0c7d6a48338 From f38495b5aa5e16ed3a79fb704c6d0f169f7361ee Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sun, 12 Jul 2020 18:06:48 +0200 Subject: [PATCH 11/11] Update to 0.55.0 Signed-off-by: Igor Raits --- meson.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meson.spec b/meson.spec index 88b8b39..746a5f8 100644 --- a/meson.spec +++ b/meson.spec @@ -6,7 +6,7 @@ %bcond_with check Name: meson -Version: 0.55.0~rc2 +Version: 0.55.0 Release: 1%{?dist} Summary: High productivity build system @@ -111,6 +111,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Sun Jul 12 2020 Igor Raits - 0.55.0-1 +- Update to 0.55.0 + * Mon Jul 06 2020 Igor Raits - 0.55.0~rc2-1 - Update to 0.55.0rc2 diff --git a/sources b/sources index ece4e2e..9f248e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (meson-0.55.0rc2.tar.gz) = 570fb808ec20738c27658fa9357068641bd2e778bc4609ca178a448e1447695d45d596a696343a4fdfec0fa79737ffb490dd83cc817d94dec2cdf0c7d6a48338 +SHA512 (meson-0.55.0.tar.gz) = bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2