rpm/meson
SHA256
1
0
Fork 0
forked from pool/meson
Code Pull Requests Activity

Accepting request 1132585 from home:yfjiang:branches:devel:tools:building

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2023-12-13 15:06:27 +00:00 committed by Git OBS Bridge
parent 7df4137c20
commit cf6ee9031a
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meson.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Dec 12 01:47:37 UTC 2023 - Yifan Jiang <yfjiang@suse.com>
- 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 <yfjiang@suse.com>
- Specify clang and llvm versions in SLE/Leap.
-------------------------------------------------------------------
Mon Dec 11 10:25:14 UTC 2023 - Yifan Jiang <yfjiang@suse.com>
- 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 <dimstar@opensuse.org> Mon Nov 27 14:29:20 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
@ -217,6 +235,13 @@ Sat Feb 25 16:14:07 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
+ clang-cl (13) now accepts cpp_std=c++20 + clang-cl (13) now accepts cpp_std=c++20
+ a sizable collection of bug fixes + a sizable collection of bug fixes
-------------------------------------------------------------------
Mon Jan 16 01:36:31 UTC 2023 - Yifan Jiang <yfjiang@suse.com>
- 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 <luc14n0@opensuse.org> Thu Jan 5 04:43:00 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>

15
meson.spec
View File

@ -68,7 +68,11 @@ BuildArch: noarch
ExclusiveArch: x86_64 ExclusiveArch: x86_64
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
BuildRequires: bison BuildRequires: bison
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
BuildRequires: clang17 >= 15
%else
BuildRequires: clang >= 15 BuildRequires: clang >= 15
%endif
BuildRequires: clang-tools >= 15 BuildRequires: clang-tools >= 15
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: distribution-release BuildRequires: distribution-release
@ -104,8 +108,15 @@ BuildRequires: libjpeg-devel
BuildRequires: libpcap-devel BuildRequires: libpcap-devel
BuildRequires: libqt5-qtbase-common-devel BuildRequires: libqt5-qtbase-common-devel
BuildRequires: libqt5-qtbase-private-headers-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 BuildRequires: libwmf-devel
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
BuildRequires: llvm17-devel
%else
BuildRequires: llvm-devel BuildRequires: llvm-devel
%endif
BuildRequires: meson = %{version} BuildRequires: meson = %{version}
BuildRequires: ninja BuildRequires: ninja
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -262,8 +273,8 @@ export PATH="${PWD}/bin:${PATH}"
c++ --version c++ --version
# Fix shebang in test cases getting executed by ninja # Fix shebang in test cases getting executed by ninja
%python_expand find test\ cases -type f -name "*.py" \ %{python_expand find test\ cases -type f -name "*.py" \
-exec sed -i "1s@#!.*python.*@#!$(realpath %{_bindir}/$python)@" {} + -exec sed -i "1s@#!.*python.*@#!$(realpath %{_bindir}/$python)@" {} +}
%endif %endif
export LANG=C.UTF-8 export LANG=C.UTF-8