pool/meson
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1167953 from devel:tools:building

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1167953
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=109
This commit is contained in:
Dominique Leuenberger 2024-04-17 12:45:20 +00:00 committed by Git OBS Bridge
commit 4fc2ac820a
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Apr 15 10:35:55 UTC 2024 - Yifan Jiang <yfjiang@suse.com>
- Set the latest supported gcc13 to build meson:test on SLE/Leap.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 13 07:29:51 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Wed Mar 13 07:29:51 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

20
meson.spec
View File

@ -80,10 +80,10 @@ BuildRequires: cups-devel
BuildRequires: distribution-release BuildRequires: distribution-release
BuildRequires: flex BuildRequires: flex
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000 %if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
BuildRequires: gcc12-c++ BuildRequires: gcc13-c++
BuildRequires: gcc12-fortran BuildRequires: gcc13-fortran
BuildRequires: gcc12-obj-c++ BuildRequires: gcc13-obj-c++
BuildRequires: gcc12-objc BuildRequires: gcc13-objc
%else %else
BuildRequires: gcc-c++ >= 12 BuildRequires: gcc-c++ >= 12
BuildRequires: gcc-fortran >= 12 BuildRequires: gcc-fortran >= 12
@ -265,13 +265,13 @@ done < meson.egg-info/SOURCES.txt
%check %check
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000 %if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
# Use gcc-12 for clang-tidy # Use gcc-13 for clang-tidy
install -d -m 0755 bin install -d -m 0755 bin
ln -s /usr/bin/cpp-12 bin/cpp ln -s /usr/bin/cpp-13 bin/cpp
ln -s /usr/bin/g++-12 bin/c++ ln -s /usr/bin/g++-13 bin/c++
ln -s /usr/bin/g++-12 bin/g++ ln -s /usr/bin/g++-13 bin/g++
ln -s /usr/bin/gcc-12 bin/cc ln -s /usr/bin/gcc-13 bin/cc
ln -s /usr/bin/gcc-12 bin/gcc ln -s /usr/bin/gcc-13 bin/gcc
export PATH="${PWD}/bin:${PATH}" export PATH="${PWD}/bin:${PATH}"
c++ --version c++ --version