From cc90324fceea5c46a7094e299929fa47ec9a86f761f839d9e9d7fac5ce6ddbcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 3 Jul 2024 13:45:34 +0000 Subject: [PATCH] Accepting request 1185120 from home:dimstar:Factory - Limit explicit GCC13 usage to suse_version < 1600, i.e to Leap 15.x. Future versions are supposed to have a recent enough GCC version. OBS-URL: https://build.opensuse.org/request/show/1185120 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libvpx?expand=0&rev=134 --- libvpx.changes | 7 +++++++ libvpx.spec | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libvpx.changes b/libvpx.changes index e7e6a7a..4ba98e7 100644 --- a/libvpx.changes +++ b/libvpx.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 3 13:00:34 UTC 2024 - Dominique Leuenberger + +- Limit explicit GCC13 usage to suse_version < 1600, i.e to Leap + 15.x. Future versions are supposed to have a recent enough GCC + version. + ------------------------------------------------------------------- Wed Jul 3 08:23:41 UTC 2024 - Adrian Schröter diff --git a/libvpx.spec b/libvpx.spec index e3b79d0..860b498 100644 --- a/libvpx.spec +++ b/libvpx.spec @@ -17,6 +17,7 @@ %define sover 9 +%define use_gcc13 0%{?suse_version} < 1600 Name: libvpx Version: 1.14.1 Release: 0 @@ -27,7 +28,7 @@ URL: https://www.webmproject.org/ Source0: %{name}-%{version}.tar.xz Source1000: baselibs.conf Patch2: libvpx-configure-add-arch.patch -%if 0%{?suse_version} < 1699 +%if %use_gcc13 BuildRequires: gcc13-c++ %else BuildRequires: gcc-c++ @@ -101,7 +102,7 @@ sed -i~ /ssse3/d configure sed -i~ 's@ssse3@@' build/make/rtcd.pl %endif cd build -%if 0%{?suse_version} < 1699 +%if %use_gcc13 export CXX=g++-13 export CC=gcc-13 %endif