gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-util/ccache: fixup httplib patch for >=0.16.0

Browse Source 
Switch to the variant that I submitted upstream & was merged.

Bug: https://github.com/yhirose/cpp-httplib/issues/1851
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2024-06-19 15:43:05 +01:00
parent 1f263a50c2
commit 5651f7d6d8
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dev-util/ccache/files/ccache-4.10-unittest-httplib.patch
View File

@@ -1,12 +1,26 @@
TODO: send upstream (in Gentoo, we don't rename it to cpp-httplib, so need to check for that as a library too)
https://github.com/ccache/ccache/pull/1465
https://github.com/ccache/ccache/commit/a641e5ea3087752af71e60690dcf3ed3c1dbc56a
From a641e5ea3087752af71e60690dcf3ed3c1dbc56a Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sat, 8 Jun 2024 15:11:48 +0100
Subject: [PATCH] build: Find CppHttplib named libhttplib.so as well (#1465)
On Gentoo, the library name is 'httplib', not 'cpp-httplib'. Search
for that first (as it appears to be "more vanilla"), then fall back
to 'cpp-httplib'.
--- a/cmake/FindCppHttplib.cmake
+++ b/cmake/FindCppHttplib.cmake
@@ -12,7 +12,7 @@ else()
@@ -12,7 +12,11 @@ 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(NOT CPPHTTPLIB_LIBRARY)
+ find_library(CPPHTTPLIB_LIBRARY cpp-httplib)
+ endif()
+
if(CPPHTTPLIB_LIBRARY)
message(STATUS "Using system CppHttplib (${CPPHTTPLIB_LIBRARY})")
add_library(dep_cpphttplib UNKNOWN IMPORTED)