Accepting request 1189952 from devel:tools:building
OBS-URL: https://build.opensuse.org/request/show/1189952 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ccache?expand=0&rev=79
This commit is contained in:
commit
9369855ad6
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:3a43442ce3916ea48bb6ccf6f850891cbff01d1feddff7cd4bbd49c5cf1188f6
|
|
||||||
size 485228
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEWpOacaRnks9XhmpRmW3aB1WUrbgFAmaBqFsACgkQmW3aB1WU
|
|
||||||
rbgOgBAAqwQBL99XIPBF8Me+KrD1HqBryT9VkNhUlvIeOrNjuHK3BnM+rRBiauAI
|
|
||||||
dfvdDjyoshhVp/Np67Z5qEYgeYr52cruQj+JlRMsbwCiWlZgiqvBckjzttne2QfD
|
|
||||||
0wxdOtiLW5ejl19RZqIzcCGL818alRMAwXnBRJFcxsW7j3RYrJZLjZkl6FBaGncu
|
|
||||||
Y54nkk+UnjIIFh17hcAsGT29eC8PoLerohTMf1U3BOVSyNV9X4XT+eWqYh83cT7G
|
|
||||||
VQA1bMZ9BWZvQlj+acC+nRkgFkBhvMEt47FvV0lHQv+U9+heWr0ONmzhnv2c2bLz
|
|
||||||
7BWrpBvp4nyRqO6GdNu6Na7f0Fq+D137AeXt1jWGfWS5vBNSPZjJoe5Kv08bZmTA
|
|
||||||
7RTGVIrX+UGT04PFrBWAihvLP0RLTi5SL6tnXGIcU26SzKDU6/ZQRMzKRXsPA5kS
|
|
||||||
xCo45pFeMVgaX3uBOGHI1eQVF49DbEl0gOvG6idSbXdKwRIqd/UDBS3ZuWo2QOH/
|
|
||||||
zWwND6SbJERJkUH5mXXiBaNSa4IMIW7f2f/ejhzWayQXgmPSVMC74miJSWBYRa2n
|
|
||||||
vZvNemxfXWL1bpDqnMRCfN9Df0ZTmlDFxSLNYG6hn8M9szbR5lVaFhdy5pjyDLs5
|
|
||||||
RNPaf25iQ5/TUV/7/4pFp3HeNXBjENjX99fZ1QO7j207jvGulHM=
|
|
||||||
=CUPc
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
ccache-4.10.2.tar.xz
Normal file
3
ccache-4.10.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:c0b85ddfc1a3e77b105ec9ada2d24aad617fa0b447c6a94d55890972810f0f5a
|
||||||
|
size 485460
|
16
ccache-4.10.2.tar.xz.asc
Normal file
16
ccache-4.10.2.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEWpOacaRnks9XhmpRmW3aB1WUrbgFAmaeZpEACgkQmW3aB1WU
|
||||||
|
rbjI7xAApROJreGwaoniBJrUESZ3fzaqFAj3eth8cL1Uro9Y2d8Gm8i5Tu8ax14A
|
||||||
|
0nSEPygRvFVQLVo+fIehh08XUL5EiR8Nuu5Bxlucvrv74N2ZMKzf3lhxzbp+xZtx
|
||||||
|
bhZIOVuqAm/7JYVJ/QCYaXWI8a4r9s4X+GOIpxxusD1B2ocuY8CMzlQPs6JXTlQC
|
||||||
|
/O7OfyCddTkrQT0T8eP/0vD6nUp41YIt7t2br9N9fxRiV8bc8uWlxZb31HIzGgmW
|
||||||
|
Rhvy9/u59v/unx48dmzeBPRpEjoMHVaYLvc5yweO5uJ/mDAuCiN28MgHIv/LY2N0
|
||||||
|
AJHOGXS9EuO9zBfQS9fIAcwCqy7jb+B5KNxACZizmvg5TusPD+EqZWbOmFQlPQ6Z
|
||||||
|
X0ggj9uWBJJZj0YIrlm2UX82Ai9kIeVmIGDFVu+vqvTM/lfjFpopjNiZO20tbpJs
|
||||||
|
JYvZP+dAOAAwh6ZSvM8zd7BT9fa7OzuOKpQkFi6sDeLz0vaPAQcaCCCOI1QNGn9S
|
||||||
|
juif5dRQVMPi/YvCg4pkJxMVYsq7o6fqql7ccmlCrX2p3fr35ljsJaz7Nqi46tN+
|
||||||
|
ZVDunXURgkRnVGX4vv8vmQEeCioTmWBwrUwcu7G67IiMlh07/lEp4RhCPaNjByZ+
|
||||||
|
l5NYcJ0RsqsKaRf4lVek3MKLacr96Bs8GCjpSreLSGYf4ApEJ9I=
|
||||||
|
=jhxx
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 26 15:10:37 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
|
||||||
|
|
||||||
|
- Update to 4.10.2:
|
||||||
|
* Fixed detection of Fmt version 11 and newer.
|
||||||
|
* Made the “-fprofile-update=atomic” test only run when that
|
||||||
|
option is supported by the compiler.
|
||||||
|
* Made the color diagnostics tests work when the user running the
|
||||||
|
tests has a non-POSIX login shell.
|
||||||
|
- Remove fmt_fix.patch
|
||||||
|
* Already included in 4.10.2 upstream release
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jul 18 09:28:12 UTC 2024 - Ana Guerrero <ana.guerrero@suse.com>
|
Thu Jul 18 09:28:12 UTC 2024 - Ana Guerrero <ana.guerrero@suse.com>
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
%bcond_with hiredis
|
%bcond_with hiredis
|
||||||
%endif
|
%endif
|
||||||
Name: ccache
|
Name: ccache
|
||||||
Version: 4.10.1
|
Version: 4.10.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A Fast C/C++ Compiler Cache
|
Summary: A Fast C/C++ Compiler Cache
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
@ -31,8 +31,6 @@ URL: https://ccache.dev/
|
|||||||
Source0: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz
|
Source0: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz
|
||||||
Source1: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz.asc
|
Source1: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz.asc
|
||||||
Source2: %{name}.keyring
|
Source2: %{name}.keyring
|
||||||
# PATCH-FIX-UPSTREAM
|
|
||||||
Patch0: fmt_fix.patch
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: doctest-devel
|
BuildRequires: doctest-devel
|
||||||
BuildRequires: fmt-devel
|
BuildRequires: fmt-devel
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
Includes two commits:
|
|
||||||
https://github.com/ccache/ccache/commit/71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1
|
|
||||||
https://github.com/ccache/ccache/commit/3b09afc5f792f0bd0a15cf6b8408ea40eb069787
|
|
||||||
|
|
||||||
diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake
|
|
||||||
index 55126a31..7c39291e 100644
|
|
||||||
--- a/cmake/FindFmt.cmake
|
|
||||||
+++ b/cmake/FindFmt.cmake
|
|
||||||
@@ -3,11 +3,20 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
|
|
||||||
if(DEP_FMT STREQUAL "BUNDLED")
|
|
||||||
message(STATUS "Using bundled Fmt as requested")
|
|
||||||
else()
|
|
||||||
- find_path(FMT_INCLUDE_DIR fmt/core.h)
|
|
||||||
+ find_path(FMT_INCLUDE_DIR NAMES fmt/base.h fmt/core.h)
|
|
||||||
find_library(FMT_LIBRARY fmt)
|
|
||||||
if(FMT_INCLUDE_DIR AND FMT_LIBRARY)
|
|
||||||
- file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
|
|
||||||
- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
|
|
||||||
+ if(EXISTS "${FMT_INCLUDE_DIR}/fmt/base.h")
|
|
||||||
+ set(_fmt_h base.h)
|
|
||||||
+ else()
|
|
||||||
+ set(_fmt_h core.h)
|
|
||||||
+ endif()
|
|
||||||
+ file(READ "${FMT_INCLUDE_DIR}/fmt/${_fmt_h}" _fmt_h_content)
|
|
||||||
+ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_h_content}")
|
|
||||||
+ if("${CMAKE_MATCH_0}" STREQUAL "")
|
|
||||||
+ message(FATAL_ERROR "FMT_VERSION not found")
|
|
||||||
+ return()
|
|
||||||
+ endif()
|
|
||||||
math(EXPR _fmt_major "${CMAKE_MATCH_1} / 10000")
|
|
||||||
math(EXPR _fmt_minor "${CMAKE_MATCH_1} / 100 % 100")
|
|
||||||
math(EXPR _fmt_patch "${CMAKE_MATCH_1} % 100")
|
|
Loading…
Reference in New Issue
Block a user