diff options
| author |   Sam James <sam@gentoo.org> | 2024-06-19 15:43:05 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-06-19 15:43:24 +0100 |
| commit | 5651f7d6d8ecf7ccbf4a192a0a84b749478ed1d9 (patch) | |
| tree | b545bbaf56d1790087beaab404176ae6c7f92e3f /dev-util | |
| parent | dev-python/roman: enable py3.13 (diff) | |
| download | gentoo-5651f7d6d8ecf7ccbf4a192a0a84b749478ed1d9.tar.gz gentoo-5651f7d6d8ecf7ccbf4a192a0a84b749478ed1d9.tar.bz2 gentoo-5651f7d6d8ecf7ccbf4a192a0a84b749478ed1d9.zip | |
dev-util/ccache: fixup httplib patch for >=0.16.0
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>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/ccache/files/ccache-4.10-unittest-httplib.patch | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/dev-util/ccache/files/ccache-4.10-unittest-httplib.patch b/dev-util/ccache/files/ccache-4.10-unittest-httplib.patch index 2689ba7fcbde..2c466013c219 100644 --- a/dev-util/ccache/files/ccache-4.10-unittest-httplib.patch +++ b/dev-util/ccache/files/ccache-4.10-unittest-httplib.patch @@ -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) |