Accepting request 1139886 from home:dspinella:branches:devel:tools:building

- Fix SLE build by using gcc11 and disable hiredis dependency

OBS-URL: https://build.opensuse.org/request/show/1139886
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ccache?expand=0&rev=140
This commit is contained in:
Martin Pluskal 2024-01-19 10:25:25 +00:00 committed by Git OBS Bridge
parent 3d25b81a39
commit 929379df8d
2 changed files with 16 additions and 0 deletions

View File

@ -49,6 +49,7 @@ Thu Jan 18 10:54:53 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>
* The manual now mentions that system_headers sloppiness is not supported for
MSVC.
* Fixed regex in direct.bash.
- Fix SLE build by using gcc11 and disable hiredis dependency
-------------------------------------------------------------------
Sat Oct 28 19:46:57 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>

View File

@ -16,7 +16,12 @@
#
# Build with hiredis by default only on TW
%if %{?suse_version} > 1600
%bcond_without hiredis
%else
%bcond_with hiredis
%endif
Name: ccache
Version: 4.9
Release: 0
@ -27,7 +32,14 @@ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/c
Source1: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz.asc
Source2: %{name}.keyring
BuildRequires: cmake
%if %{?suse_version} > 1600
BuildRequires: gcc
BuildRequires: gcc-c++
# SLE requires gcc11 for std::filesystem
%else
BuildRequires: gcc11
BuildRequires: gcc11-c++
%endif
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libzstd) >= 1.1.2
BuildRequires: rubygem(asciidoctor)
@ -49,6 +61,9 @@ Objective-C++.
%autosetup -p1
%build
%if %{?suse_version} < 1600
export CC=gcc-11 CXX=g++-11
%endif
%cmake \
%if !%{with hiredis}
-DREDIS_STORAGE_BACKEND=OFF \