gentoo auto-resync : 01:06:2024 - 00:07:06

5 files changed, 274 insertions, 0 deletions

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index d00cfa150edb..04c221484d75 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,15 +1,22 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530ce8dbcfacb1c3835523ec41ff35701536698827f11c39c1e06641fcf6b57d374944ecb44888a66c7860f97b813 SHA512 cc53f44b173c1ae66258aa573182ae936304dac9daf8489a20c45dbe3d554df207bd93b370da2c86b22fbc4edf5fd954f84fd18812d97d41a88ea4c7926f117c
+AUX ccache-4.10-avoid-run-user.patch 1288 BLAKE2B 265e331172f97edfed18c5dc06e2726e083aede833eea9fdf13c940e1534f9e1d7705353679c22d3d6518870667c10f3df2410f56b59f0540535720a37a590c9 SHA512 2f4efb047ce1f735935b575e006e78be2c640330aef3acc4cc2610f36943dbd5c5c6582e1310ae1a5d53c24f3437fe764a7397a7a786dd2f53feaea867d4422e
+AUX ccache-4.10-blake3.patch 3043 BLAKE2B ef372a28e43ac0bc0545c1a9421a96a92d370f2da6195cd0d3f951eb6def1ba802494b6d0e62796aa24b8e1afc35f87b1f1a66626cbe074639ff34bcf1ad3d09 SHA512 20cfa0e9c2e05955e28256d6561a4773db269d21dcb0bee5d545c13439352d0990eef88a5bbbe282adffcfc88ac9bf5e3a95d2c4a6f4d232ebaf53d0e0587355
+AUX ccache-4.10-unittest-httplib.patch 738 BLAKE2B 0534909560cdc677517c46aff0d0c1ca17755f6abde37d59da50de3fe1d0faac762ef8329556785ac5f0d3732729fc6f40e56cb5f88f55682957ffbd291404fb SHA512 7ea81ca4e2b24a6be5de66b3fd03d7ceaaaf573865ed17ce82b50e8da4812a4da8540f4e5c6d239ffd921ed86b3c0dca2f8277bbcb09cd41b32a052bc934c2d8
 AUX ccache-4.8-avoid-run-user.patch 1270 BLAKE2B 2ecdef4b319a2d3c2fd4740667ae22b6134d977b252d9d022acfab723cc9c2cd7f11ea4f2674d5461fba5e3cf5574de39a3df840451670b68689569b819f2cb3 SHA512 898b0d7041af9765ac2a5f26099256e96c881d39452eb0cc90d859f9f64dab2d31d673d6b538958337a6f7848eb2ebf309064e96c37567e271a42e46c948b0ea
 AUX ccache-4.9-avoid-run-user.patch 1274 BLAKE2B 04df088e408ac82390f8f2c83d1a148b067a9c0215f70b0e51c347b4bc0c7221b56ea2608b9035a70ec1e9c4668d50f11db2fa223a2dc21ea0cdde71e2beb548 SHA512 b0faf07c1d3bfeafe8c7b25106e9abaaee47c3439254c8cf92e1140957760d6cfaf25ca1076c935973e5b58730bb2188957902e25f2293b0e8754fb2f13fa625
 AUX ccache-4.9.1-distcc.patch 1425 BLAKE2B b6617c44d8722b11b56f0a8df9e97010aed501407ed6356ec49eccabf836a272c4e6bd94f146aa4959119c44bc335d8eedc5e2f3e99304c20c3bf0fefaeb0fd3 SHA512 9b80d72abc7a047c8ac617461bd8819997267cf731116a33b76c142406ed87704493ff4e76a45a71dbb5ad100a0165c1b73dc7d923f9df63b57977b7152bf669
 AUX ccache-config-3 2171 BLAKE2B 2b2e3c61b6f6897847503a4c8fa3b906cea1f39e1ebd21f8313e6adc8b1106252c4ceb6dab7d8ba7f4eb520909adf409b7dc12da1904378a94275a7b3437f53c SHA512 8ebb4b8992074ce41bbc6098094ecd993c012bb62ece1b86fade76df73465f558872354ab24e6037a5bf71428f2a03324782181ef0945e6e9dcf3418b608fa3b
+DIST ccache-4.10-docs.tar.xz 82900 BLAKE2B 0d0ef988bb21bc05642c2d5ea42bdf9c87c190464d3bddc08a8bf281b003670a50a07a88bf31731a781d5454be09b87168bc8df3b239b93f4e3d3e3f667e9094 SHA512 c1030e76dea6eaeed5548dda80a766bb9c944f8e1223157eb7a227f08f80f48a8fece4e1a99beced4c6075b40ec7de3df662111c95f9390624f6e9a3b04c1083
+DIST ccache-4.10.tar.xz 411272 BLAKE2B 55e4efa41a53a664e8dfa25cd2b21dda80bf7847c467cf361058aaf06425a5c494d9e5b71e70f7d9327a6d57672af271946ad4e24fbd99f49c0bb8c256a9a2a5 SHA512 8bc8451a5e66300cb26ef7c1348d1b47e164ede17eab7f5f857a584a9def599c5c752d5591017a5e5b9673f108bb7a4a5bd59368e379fed9531e833fca8808a4
+DIST ccache-4.10.tar.xz.asc 833 BLAKE2B 4cdd6ce059ab54dca39365120b74e675a5a8c16e280f2e812d7a81feecda4283b63f84bf921d8b18493e348de38850facc95d48f0631e9ae46f33d7154a01f21 SHA512 faa3177d07a63746fe1dac1e748124d85207aa51d55894523e88074bf3b02deba7e961d2f7de48265acc6898bdd083bb48cb65631b02d9f7bdb7a27364d0fc4c
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9 SHA512 e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
 DIST ccache-4.8.3.tar.xz 569724 BLAKE2B 53211db0e516eea9739b8f05bf6a3db678b4b5cff7af741469360556da20a320e4a40253ca9e51568045a394d3497b428413ff6cf77f4273aa4906357b427d1f SHA512 e0e344cd215de67fe060b36fb1b902bab61454477624fbe41d2ec57fdd721cec9c8920ca834f0ef0ccfeedb961b17143f18197497557887d88911ff66e330478
 DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B e800b7bdce705db3ced97f0fe008e8391811f9c7c49e815b6cd2cf220cf1107f3941d29d7bcdd10f79da4e6cad9766243e482011aeb5a170e1c5920b6ebdd726 SHA512 2e2298a3cf800d9de669f560269bd07ca2b76f761198af10f7174759ea95a23518dedce83f481bdd392bb60adbd736e5dd2c21af88beb761c0f589f685737586
 DIST ccache-4.9-docs.tar.xz 82684 BLAKE2B bc3517803cac75a0124358f740e3f4f4b923341277b77cb9ac7649520bbf19a65a51ebf324cc886f98e606bd29681ca3956073a85b737159792e068d529e299c SHA512 870d15dc9e3a0557dfe533862927ff8e90730678439b576e782f79f1f69c5bb499ff4c7e397a7eca059691ec5f89412594e32c74209a58003a6f55002c00d467
 DIST ccache-4.9.1.tar.xz 583764 BLAKE2B 9ebaf335fda54666e4bfc8f2c402f2b908b3922f3898b6a739b0256481256c6121546021b80fd2dbc93f3aea254db63a8624b97b2820b88e73e502a243bf2562 SHA512 5ae4537a7e546b779c80f5adadce1349a84da3a47b255bda06cb2678ee5403307f013c08c8541a21f6f1fb36a0b64bdbcf785fbd2fcfe3009150117250e75b0b
 DIST ccache-4.9.1.tar.xz.asc 833 BLAKE2B a157b0c2c0777732d9a51fb7519f561fac098bbac9ba33fe453b210a6e9a34372b5d00b0fa940d2b783ab0eb48e7bc98707de884b191d83120d9ad8239c9fb76 SHA512 43605eca0f9a62565486c6c7ff622fc4d18a400518aa9c9e3c9d865a99c40c63a6a09d42ccd3428d28575c4de8a69be89c93830d26261d3479792e67179d0839
+EBUILD ccache-4.10-r1.ebuild 4030 BLAKE2B 4934d641ae30145a47b8b82f20e22507643632650017a7c61fced2e17ea5e1dc222958d9a104afc342f95f516e0b811dd987cc5a3637ea5dcd55e41b0f0064a5 SHA512 d4e227d9396e9bfbae7b5ab03038e2412bd8fa5276d1895fcd8aa375f4f357adf7d1e2373b997bbea9e8ee2802d1336e117ddfbae1ad48a0859504bf41af644b
 EBUILD ccache-4.8.3.ebuild 3752 BLAKE2B 0f308f104c92a68219f1a54b2122f6913030eaa59d72fe8730d0cdeff62d4db234146d4d2e6abed64f5c86b770ea335c8a06788590b6d23d040d869ab8e3347c SHA512 bec7baf39f9f603fa242be8bfba506431e1de7e8c8f182a6f1b15fe14823748478dc24db2672282831baadb65153a1a20d19441ced32c56f0da6ec2ccd68d190
 EBUILD ccache-4.9.1-r1.ebuild 3786 BLAKE2B 3e41e799c604cfc5ac812fe89e9db4e48684a72aeee08c6a0a281d01df9a9a892bd5f74713ffdceac450419510df8c5fac06a5a1aced7ec6e552d777968f3bc0 SHA512 af2a9f19eaad9512be78ccf8657ae0270f5d872f084cd9edc7978630b3c2219010cf58eeb108c734a0cdf04e513c3856c3f60af84b97ff3d0015a2eed724bc59
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.10-r1.ebuild b/dev-util/ccache/ccache-4.10-r1.ebuild
new file mode 100644
index 000000000000..f78605776994
--- /dev/null
+++ b/dev-util/ccache/ccache-4.10-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+	SRC_URI+=" !doc? ( https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz )"
+	MY_DOCS_USEFLAG="doc"
+fi
+
+# https://ccache.dev/license.html
+# ccache, blake3, NonstdSpan, tl-expected
+LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+# TODO: package NonstdSpan, TlExpected
+# TODO: upstream httplib patch
+DEPEND="
+	>=app-arch/zstd-1.3.4:=
+	>=dev-cpp/cpp-httplib-0.10.6:=
+	>=dev-libs/blake3-1.4.0:=
+	>=dev-libs/libfmt-8.0.0:=
+	>=dev-libs/xxhash-0.8.0
+	redis? ( >=dev-libs/hiredis-0.13.3:= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+BDEPEND="
+	doc? ( dev-ruby/asciidoctor )
+	test? (
+		>=dev-cpp/doctest-2.4.6
+		dev-libs/elfutils
+	)
+	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
+"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.10-avoid-run-user.patch
+	"${FILESDIR}"/${PN}-4.10-unittest-httplib.patch
+	"${FILESDIR}"/${P}-blake3.patch
+)
+
+src_unpack() {
+	# Avoid aborting on the doc tarball
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	cp "${FILESDIR}"/ccache-config-3 ccache-config || die
+	eprefixify ccache-config
+}
+
+src_configure() {
+	# Mainly used in tests
+	tc-export CC OBJDUMP
+
+	# Avoid dependency on libstdc++.so. Useful for cases when
+	# we would like to use ccache to build older gcc which injects
+	# into ccache locally built (possibly outdated) libstdc++
+	# See bug #761220 for examples.
+	#
+	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+	use static-c++ && append-ldflags -static-libstdc++
+
+	local mycmakeargs=(
+		-DENABLE_DOCUMENTATION=$(usex doc)
+		-DENABLE_TESTING=$(usex test)
+		-DDEPS=LOCAL
+		-DREDIS_STORAGE_BACKEND=$(usex redis)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
+	fi
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] ; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/ccache/files/ccache-4.10-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.10-avoid-run-user.patch
new file mode 100644
index 000000000000..d60cc365f25d
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.10-avoid-run-user.patch
@@ -0,0 +1,34 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+
+(4.1 update:
+https://github.com/ccache/ccache/issues/984
+https://github.com/ccache/ccache/issues/1044
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
+... gets us closer, but not there yet.)
+
+And see https://github.com/ccache/ccache/discussions/1086#discussioncomment-3327565.
+
+https://bugs.gentoo.org/837362 for 4.6 issue.
+https://bugs.gentoo.org/883799 and https://bugs.gentoo.org/887019 fo 4.8 issue.
+--- a/src/ccache/Config.cpp
++++ b/src/ccache/Config.cpp
+@@ -1193,17 +1193,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir() const
+ {
+-  static const std::string run_user_tmp_dir = [] {
+-#ifndef _WIN32
+-    const char* const xdg_runtime_dir = getenv("XDG_RUNTIME_DIR");
+-    if (xdg_runtime_dir && DirEntry(xdg_runtime_dir).is_directory()) {
+-      auto dir = FMT("{}/ccache-tmp", xdg_runtime_dir);
+-      if (fs::create_directories(dir) && access(dir.c_str(), W_OK) == 0) {
+-        return dir;
+-      }
+-    }
+-#endif
+-    return std::string();
+-  }();
+-  return !run_user_tmp_dir.empty() ? run_user_tmp_dir : m_cache_dir + "/tmp";
++  return m_cache_dir + "/tmp";
+ }
diff --git a/dev-util/ccache/files/ccache-4.10-blake3.patch b/dev-util/ccache/files/ccache-4.10-blake3.patch
new file mode 100644
index 000000000000..5789051200eb
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.10-blake3.patch
@@ -0,0 +1,79 @@
+https://github.com/ccache/ccache/pull/1464
+
+From d159306db8398da233df6481ac3fd83460ef0f0b Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:26:41 +0800
+Subject: [PATCH 1/4] Fix detection of system blake3
+
+The existing code mistakenly always rejects the system version as too old because it doesn't parse the version from the header correctly.
+
+This change fixes that.
+--- a/cmake/FindBlake3.cmake
++++ b/cmake/FindBlake3.cmake
+@@ -8,7 +8,7 @@ else()
+   find_library(BLAKE3_LIBRARY blake3)
+   if(BLAKE3_INCLUDE_DIR)
+     file(READ "${BLAKE3_INCLUDE_DIR}/blake3.h" _blake3_h)
+-    string(REGEX MATCH "#define _blake3_version_string \"([0-9]+).([0-9]+).*([0-9]+)\"" _ "${_blake3_h}")
++    string(REGEX MATCH "#define BLAKE3_VERSION_STRING \"([0-9]+).([0-9]+).*([0-9]+)\"" _ "${_blake3_h}")
+     set(_blake3_version_string "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
+     if(NOT "${CMAKE_MATCH_0}" STREQUAL "" AND "${_blake3_version_string}" VERSION_GREATER_EQUAL "${Blake3_FIND_VERSION}")
+       if(BLAKE3_LIBRARY)
+
+From fa4046966e71011587364b0241255130b62858fb Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:43:11 +0800
+Subject: [PATCH 2/4] Fix blake3 include in Hash.hpp
+
+System installations of blake3 install the `blake3.h` header directly into the `include` directory and not into a `blake3` subdirectory.
+--- a/src/ccache/Hash.hpp
++++ b/src/ccache/Hash.hpp
+@@ -21,7 +21,7 @@
+ #include <ccache/util/PathString.hpp>
+ #include <ccache/util/conversion.hpp>
+ 
+-#include <blake3/blake3.h>
++#include <blake3.h>
+ #include <nonstd/span.hpp>
+ #include <tl/expected.hpp>
+ 
+
+From 36f8eeea1cb986440f51c1eee9db563493103462 Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:44:53 +0800
+Subject: [PATCH 3/4] Fix include path for bundled blake3
+
+We modified the include directive for `blake3.h` in `Hash.hpp`, so we need this in order for builds that use the bundled blake3 to keep working.
+--- a/src/third_party/blake3/CMakeLists.txt
++++ b/src/third_party/blake3/CMakeLists.txt
+@@ -7,7 +7,7 @@ add_library(
+   "${CMAKE_CURRENT_SOURCE_DIR}/blake3/blake3_portable.c"
+ )
+ 
+-target_include_directories(dep_blake3 INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
++target_include_directories(dep_blake3 INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/blake3")
+ target_link_libraries(dep_blake3 PRIVATE standard_settings)
+ 
+ if(MSVC)
+
+From 8cc68bc6f3ec8dadcb6a1244c76d865536f91be7 Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:52:59 +0800
+Subject: [PATCH 4/4] Fix `clang-format` failure
+
+--- a/src/ccache/Hash.hpp
++++ b/src/ccache/Hash.hpp
+@@ -21,10 +21,11 @@
+ #include <ccache/util/PathString.hpp>
+ #include <ccache/util/conversion.hpp>
+ 
+-#include <blake3.h>
+ #include <nonstd/span.hpp>
+ #include <tl/expected.hpp>
+ 
++#include <blake3.h>
++
+ #include <array>
+ #include <cstdint>
+ #include <cstdio>
+
diff --git a/dev-util/ccache/files/ccache-4.10-unittest-httplib.patch b/dev-util/ccache/files/ccache-4.10-unittest-httplib.patch
new file mode 100644
index 000000000000..2689ba7fcbde
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.10-unittest-httplib.patch
@@ -0,0 +1,12 @@
+TODO: send upstream (in Gentoo, we don't rename it to cpp-httplib, so need to check for that as a library too)
+--- a/cmake/FindCppHttplib.cmake
++++ b/cmake/FindCppHttplib.cmake
+@@ -12,7 +12,7 @@ else()
+     if(NOT "${CMAKE_MATCH_0}" STREQUAL "" AND "${_cpphttplib_version_string}" VERSION_GREATER_EQUAL "${CppHttplib_FIND_VERSION}")
+       # Some dists like Fedora package cpp-httplib as a single header while some
+       # dists like Debian package it as a traditional library.
+-      find_library(CPPHTTPLIB_LIBRARY cpp-httplib)
++      find_library(CPPHTTPLIB_LIBRARY httplib)
+       if(CPPHTTPLIB_LIBRARY)
+         message(STATUS "Using system CppHttplib (${CPPHTTPLIB_LIBRARY})")
+         add_library(dep_cpphttplib UNKNOWN IMPORTED)