diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-20 00:10:57 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-20 00:10:57 +0100 |
| commit | d6ca4e4f90cb75c323b5988eefa96a04c0d36908 (patch) | |
| tree | 8197fc88451976470c871e991b75a9d40c240270 /dev-util/ccache | |
| parent | e8df704cf9b5e9e517317b8912377c0a8ca0d11e (diff) | |
gentoo auto-resync : 20:06:2024 - 00:10:56
Diffstat (limited to 'dev-util/ccache')
| -rw-r--r-- | dev-util/ccache/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/ccache/files/ccache-4.10-unittest-httplib.patch | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index 27c0997a99cd..709e47cfaad7 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -2,7 +2,7 @@ AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435 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.10-unittest-httplib.patch 1230 BLAKE2B 0346b9629618c37ab967630d7d76943037b55737e23fc5cb6aa9d2f1add16291e8620aa4a6aabfaf9338fa708454cbe6fb77bafb8fe896f7e9d938045a323a19 SHA512 fc54c2ab507659b6a60155d739fb218b1b86399803d73f8e3f897aea2041da406213821904148e1f534bac1c81140c0e6aac1956b01a53c2b42654887f03c764 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 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) |