Accepting request 1167791 from home:yfjiang:branches:devel:tools:building
- Set the latest supported gcc13 to build meson:test on SLE/Leap. OBS-URL: https://build.opensuse.org/request/show/1167791 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=283
This commit is contained in:
parent
ae6440bf56
commit
2b709b5fda
@ -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>
|
||||
|
||||
|
20
meson.spec
20
meson.spec
@ -80,10 +80,10 @@ BuildRequires: cups-devel
|
||||
BuildRequires: distribution-release
|
||||
BuildRequires: flex
|
||||
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
|
||||
BuildRequires: gcc12-c++
|
||||
BuildRequires: gcc12-fortran
|
||||
BuildRequires: gcc12-obj-c++
|
||||
BuildRequires: gcc12-objc
|
||||
BuildRequires: gcc13-c++
|
||||
BuildRequires: gcc13-fortran
|
||||
BuildRequires: gcc13-obj-c++
|
||||
BuildRequires: gcc13-objc
|
||||
%else
|
||||
BuildRequires: gcc-c++ >= 12
|
||||
BuildRequires: gcc-fortran >= 12
|
||||
@ -265,13 +265,13 @@ done < meson.egg-info/SOURCES.txt
|
||||
%check
|
||||
|
||||
%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
|
||||
ln -s /usr/bin/cpp-12 bin/cpp
|
||||
ln -s /usr/bin/g++-12 bin/c++
|
||||
ln -s /usr/bin/g++-12 bin/g++
|
||||
ln -s /usr/bin/gcc-12 bin/cc
|
||||
ln -s /usr/bin/gcc-12 bin/gcc
|
||||
ln -s /usr/bin/cpp-13 bin/cpp
|
||||
ln -s /usr/bin/g++-13 bin/c++
|
||||
ln -s /usr/bin/g++-13 bin/g++
|
||||
ln -s /usr/bin/gcc-13 bin/cc
|
||||
ln -s /usr/bin/gcc-13 bin/gcc
|
||||
export PATH="${PWD}/bin:${PATH}"
|
||||
c++ --version
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user