From cf6ee9031ad6f7aca096b5c71a817835239d1ce7b537fc23d56393dd6916dfb1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Dec 2023 15:06:27 +0000 Subject: [PATCH] Accepting request 1132585 from home:yfjiang:branches:devel:tools:building - Make BuildRequires libstdc++6-devel-gcc11 more precise, for SLE 15 SP4 and SLE 15 SP5 only. - Specify clang and llvm versions in SLE/Leap. - Fix shebang replacement for ninja test cases. The curly brackets are necessary for the macro expansion in the splitted lines worked correctly. - Add BuildRequires libstdc++6-devel-gcc11 for SLE 15 SP4 and version above, which is necessary to make clang-tiny unit test run. OBS-URL: https://build.opensuse.org/request/show/1132585 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=273 --- meson.changes | 25 +++++++++++++++++++++++++ meson.spec | 15 +++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/meson.changes b/meson.changes index 27ce2d5..db4ed42 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Dec 12 01:47:37 UTC 2023 - Yifan Jiang + +- Make BuildRequires libstdc++6-devel-gcc11 more precise, for + SLE 15 SP4 and SLE 15 SP5 only. + +------------------------------------------------------------------- +Mon Dec 11 10:31:25 UTC 2023 - Yifan Jiang + +- Specify clang and llvm versions in SLE/Leap. + +------------------------------------------------------------------- +Mon Dec 11 10:25:14 UTC 2023 - Yifan Jiang + +- Fix shebang replacement for ninja test cases. The curly brackets + are necessary for the macro expansion in the splitted lines + worked correctly. + ------------------------------------------------------------------- Mon Nov 27 14:29:20 UTC 2023 - Dominique Leuenberger @@ -217,6 +235,13 @@ Sat Feb 25 16:14:07 UTC 2023 - Andreas Stieger + clang-cl (13) now accepts cpp_std=c++20 + a sizable collection of bug fixes +------------------------------------------------------------------- +Mon Jan 16 01:36:31 UTC 2023 - Yifan Jiang + +- Add BuildRequires libstdc++6-devel-gcc11 for SLE 15 SP4 and + version above, which is necessary to make clang-tiny unit test + run. + ------------------------------------------------------------------- Thu Jan 5 04:43:00 UTC 2023 - Luciano Santos diff --git a/meson.spec b/meson.spec index 48181ab..16e8b22 100644 --- a/meson.spec +++ b/meson.spec @@ -68,7 +68,11 @@ BuildArch: noarch ExclusiveArch: x86_64 BuildRequires: %{python_module devel} BuildRequires: bison +%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000 +BuildRequires: clang17 >= 15 +%else BuildRequires: clang >= 15 +%endif BuildRequires: clang-tools >= 15 BuildRequires: cups-devel BuildRequires: distribution-release @@ -104,8 +108,15 @@ BuildRequires: libjpeg-devel BuildRequires: libpcap-devel BuildRequires: libqt5-qtbase-common-devel BuildRequires: libqt5-qtbase-private-headers-devel +%if 0%{?sle_version} == 150400 || 0%{?sle_version} == 150500 +BuildRequires: libstdc++6-devel-gcc11 +%endif BuildRequires: libwmf-devel +%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000 +BuildRequires: llvm17-devel +%else BuildRequires: llvm-devel +%endif BuildRequires: meson = %{version} BuildRequires: ninja BuildRequires: pkgconfig @@ -262,8 +273,8 @@ export PATH="${PWD}/bin:${PATH}" c++ --version # Fix shebang in test cases getting executed by ninja -%python_expand find test\ cases -type f -name "*.py" \ - -exec sed -i "1s@#!.*python.*@#!$(realpath %{_bindir}/$python)@" {} + +%{python_expand find test\ cases -type f -name "*.py" \ + -exec sed -i "1s@#!.*python.*@#!$(realpath %{_bindir}/$python)@" {} +} %endif export LANG=C.UTF-8