[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

[Sergei Trofimovich]

commit:     721aeb72c6332be92433e24d7fb0533bcbe32b74
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 21:59:22 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 22:03:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721aeb72

dev-util/ccache: fix bug reference in a patch

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/ccache/files/ccache-3.3-size-on-disk.patch | 2 +-
 dev-util/ccache/files/ccache-3.4-size-on-disk.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch b/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
index e4e2ff8c647..77628968cb7 100644
--- a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
+++ b/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
@@ -1,4 +1,4 @@
-https://bugs.gentoo.org/56178
+https://bugs.gentoo.org/456178
 
 stick to the size of files on disk rather than their byte size.
 this func is only used for stats management, so this should be safe.

diff --git a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
index 4f39a0348f2..29f97964890 100644
--- a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
+++ b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
@@ -1,4 +1,4 @@
-https://bugs.gentoo.org/56178
+https://bugs.gentoo.org/456178
 
 stick to the size of files on disk rather than their byte size.
 this func is only used for stats management, so this should be safe.

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

[Sergei Trofimovich]

commit:     479b7324baaa5d6556d3d68c6cd878f63dffa9b2
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 21:57:12 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 22:03:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=479b7324

dev-util/ccache: drop unused patch

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../ccache/files/ccache-3.1.10-size-on-disk.patch   | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch b/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch
deleted file mode 100644
index 5e502912bfa..00000000000
--- a/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/56178
-
-stick to the size of files on disk rather than their byte size.
-this func is only used for stats management, so this should be safe.
-
---- a/util.c
-+++ b/util.c
-@@ -845,12 +845,7 @@ file_size(struct stat *st)
- #ifdef _WIN32
- 	return (st->st_size + 1023) & ~1023;
- #else
--	size_t size = st->st_blocks * 512;
--	if ((size_t)st->st_size > size) {
--		/* probably a broken stat() call ... */
--		size = (st->st_size + 1023) & ~1023;
--	}
--	return size;
-+	return st->st_blocks * 512;
- #endif
- }
- 

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

[Sergei Trofimovich]

commit:     357b8438948218869565b12e9aa7088a37bbe9ff
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 22:29:10 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 22:29:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357b8438

dev-util/ccache: link upstream bug report into patches

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/ccache/files/ccache-3.3-size-on-disk.patch          | 1 +
 dev-util/ccache/files/ccache-3.4-size-on-disk.patch          | 1 +
 dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch | 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch b/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
index 77628968cb7..277e9a6469a 100644
--- a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
+++ b/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
@@ -1,4 +1,5 @@
 https://bugs.gentoo.org/456178
+https://github.com/ccache/ccache/issues/442
 
 stick to the size of files on disk rather than their byte size.
 this func is only used for stats management, so this should be safe.

diff --git a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
index 29f97964890..a2f4a554cab 100644
--- a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
+++ b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
@@ -1,4 +1,5 @@
 https://bugs.gentoo.org/456178
+https://github.com/ccache/ccache/issues/442
 
 stick to the size of files on disk rather than their byte size.
 this func is only used for stats management, so this should be safe.

diff --git a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch b/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
index 2b12542d26f..dcb5cf1f497 100644
--- a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
+++ b/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
@@ -1,4 +1,5 @@
 https://bugs.gentoo.org/649440
+https://github.com/ccache/ccache/issues/442
 
 Disable cleanup based on free filesystem size.
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

[Aaron Bauman]

commit:     f3b2df8386bc6bbafb108a7f4234244cb44d7a72
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Nov 25 12:43:35 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 29 22:07:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b2df83

dev-util/ccache: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../ccache/files/ccache-3.3-size-on-disk.patch     | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch b/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
deleted file mode 100644
index 277e9a6469a..00000000000
--- a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/456178
-https://github.com/ccache/ccache/issues/442
-
-stick to the size of files on disk rather than their byte size.
-this func is only used for stats management, so this should be safe.
-
---- a/util.c
-+++ b/util.c
-@@ -845,12 +845,7 @@ file_size(struct stat *st)
- #ifdef _WIN32
- 	return (st->st_size + 1023) & ~1023;
- #else
--	size_t size = st->st_blocks * 512;
--	if ((size_t)st->st_size > size) {
--		// Probably a broken stat() call...
--		size = (st->st_size + 1023) & ~1023;
--	}
--	return size;
-+	return st->st_blocks * 512;
- #endif
- }
- 

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

[Sergei Trofimovich]

commit:     408f613f8b0247b116ac41be7bb6f42767ab88bf
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed May 20 15:33:48 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu May 21 08:22:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=408f613f

dev-util/ccache: remove unused patches

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../ccache/files/ccache-3.4-size-on-disk.patch     | 22 ------------------
 .../files/ccache-3.6-disable-sized-cleanup.patch   | 26 ----------------------
 2 files changed, 48 deletions(-)

diff --git a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
deleted file mode 100644
index a2f4a554cab..00000000000
--- a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/456178
-https://github.com/ccache/ccache/issues/442
-
-stick to the size of files on disk rather than their byte size.
-this func is only used for stats management, so this should be safe.
-
---- a/src/util.c
-+++ b/src/util.c
-@@ -845,12 +845,7 @@ file_size(struct stat *st)
- #ifdef _WIN32
- 	return (st->st_size + 1023) & ~1023;
- #else
--	size_t size = st->st_blocks * 512;
--	if ((size_t)st->st_size > size) {
--		// Probably a broken stat() call...
--		size = (st->st_size + 1023) & ~1023;
--	}
--	return size;
-+	return st->st_blocks * 512;
- #endif
- }
- 

diff --git a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch b/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
deleted file mode 100644
index dcb5cf1f497..00000000000
--- a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/649440
-https://github.com/ccache/ccache/issues/442
-
-Disable cleanup based on free filesystem size.
-
---- a/test/suites/cleanup.bash
-+++ b/test/suites/cleanup.bash
-@@ -75,6 +75,9 @@ SUITE_cleanup() {
-     done
- 
-     # -------------------------------------------------------------------------
-+# Disable test in Gentoo as we don't control temporary filesystem:
-+#     https://bugs.gentoo.org/649440
-+if false; then
-     TEST "Forced cache cleanup, size limit"
- 
-     # NOTE: This test is known to fail on filesystems that have unusual block
-@@ -101,7 +104,7 @@ SUITE_cleanup() {
-         file=$CCACHE_DIR/a/result$i-4017.o
-         expect_file_exists $file
-     done
--
-+fi
-     # -------------------------------------------------------------------------
-     TEST "Automatic cache cleanup, limit_multiple 0.9"
- 

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

[Aaron Bauman]

commit:     6ee8c5806b3628245b2fad356e65f882963a5d1e
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jun 15 12:58:50 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 16:39:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee8c580

dev-util/ccache: remove unused patch

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16253
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-util/ccache/files/ccache-3.7.8-dev-null.patch | 57 -----------------------
 1 file changed, 57 deletions(-)

diff --git a/dev-util/ccache/files/ccache-3.7.8-dev-null.patch b/dev-util/ccache/files/ccache-3.7.8-dev-null.patch
deleted file mode 100644
index 389f9e3a1e2..00000000000
--- a/dev-util/ccache/files/ccache-3.7.8-dev-null.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugs.gentoo.org/712080
-
-From 9a794689a8ba47e79c96d6c370976448b756973c Mon Sep 17 00:00:00 2001
-From: Joel Rosdahl <joel@rosdahl.net>
-Date: Sun, 22 Mar 2020 14:30:23 +0100
-Subject: [PATCH] Disable hard link mode when the output object file is
- /dev/null
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When hard link mode is enabled, ccache ≥3.6 unlinks the output file
-before writing to it as a workaround for a bug in Clang (#331). This
-unfortunately means that /dev/null will be removed when building as root
-(don’t do that, BTW) with hard link mode enabled and /dev/null as the
-the output file. A similar problem exists if the dependency file is
-/dev/null, regardless of hard link mode.
-
-Fix this by not unlinking the output file if it’s /dev/null and by not
-copying files to /dev/null at all. (There is no need to handle other
-non-regular output files since /dev/null is the only allowed non-regular
-output file.)
-
-Fixes #564.
----
- src/ccache.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/ccache.c b/src/ccache.c
-index 6e9da51..b9bafac 100644
---- a/src/ccache.c
-+++ b/src/ccache.c
-@@ -1299,6 +1299,11 @@ move_file_to_cache_same_fs(const char *source, const char *dest)
- static void
- do_copy_or_link_file_from_cache(const char *source, const char *dest, bool copy)
- {
-+	if (str_eq(dest, "/dev/null")) {
-+		cc_log("Skipping copy from %s to %s", source, dest);
-+		return;
-+	}
-+
- 	int ret;
- 	bool do_link = !copy && conf->hard_link && !file_is_compressed(source);
- 	if (do_link) {
-@@ -1432,7 +1437,8 @@ to_cache(struct args *args, struct hash *depend_mode_hash)
- 	args_add(args, "-o");
- 	args_add(args, output_obj);
- 
--	if (conf->hard_link) {
-+	if (conf->hard_link && !str_eq(output_obj, "/dev/null")) {
-+		// This is a workaround for https://bugs.llvm.org/show_bug.cgi?id=39782.
- 		x_unlink(output_obj);
- 	}
- 
--- 
-2.26.0
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

[Sergei Trofimovich]

commit:     63831f426f742d36571e6313f6dd7bbc0b09ec5e
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Nov 16 07:58:45 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 18:39:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63831f42

dev-util/ccache: remove unused patch

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18276
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/ccache/files/ccache-3.7.10-objdump.patch | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/dev-util/ccache/files/ccache-3.7.10-objdump.patch b/dev-util/ccache/files/ccache-3.7.10-objdump.patch
deleted file mode 100644
index bad334a5c54..00000000000
--- a/dev-util/ccache/files/ccache-3.7.10-objdump.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Allow ${CHOST}-objdump (or any other override)
---- a/test/suites/debug_prefix_map.bash
-+++ b/test/suites/debug_prefix_map.bash
-@@ -24,9 +24,9 @@ objdump_cmd() {
-     if $HOST_OS_APPLE; then
-         xcrun dwarfdump -r0 $1
-     elif $HOST_OS_FREEBSD; then
--        objdump -W $1
-+        ${OBJDUMP-objdump} -W $1
-     else
--        objdump -g $1
-+        ${OBJDUMP-objdump} -g $1
-     fi
- }
- 

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

[Sergei Trofimovich]

commit:     1ce68f756fdc6d3b4761d14daae898c5240b674f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon May 10 15:43:22 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon May 10 17:02:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ce68f75

dev-util/ccache: remove unused patch

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20754
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/ccache/files/ccache-4.2-atomic.patch | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/dev-util/ccache/files/ccache-4.2-atomic.patch b/dev-util/ccache/files/ccache-4.2-atomic.patch
deleted file mode 100644
index 6148e232af9..00000000000
--- a/dev-util/ccache/files/ccache-4.2-atomic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://github.com/ccache/ccache/pull/800
---- a/cmake/StdAtomic.cmake
-+++ b/cmake/StdAtomic.cmake
-@@ -10,6 +10,7 @@ set(
-     int main()
-     {
-       std::atomic<long long> x;
-+      ++x;
-       (void)x.load();
-       return 0;
-     }

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

[Conrad Kostecki]

commit:     f042e243123fc221abc67206e714f12a12fece7b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue May 16 16:10:49 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon May 22 21:25:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f042e243

dev-util/ccache: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31062
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../ccache/files/ccache-4.1-avoid-run-user.patch   | 24 ----------------------
 1 file changed, 24 deletions(-)

diff --git a/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch
deleted file mode 100644
index b1d0837ef3e0..000000000000
--- a/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Gentoo's sandbox does not whitelist this path by default yet.
-TODO: bug link.
-
-(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)
-
-Until we have a sandbox whitelisting the path let's rely on ccache's default.
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -885,11 +885,5 @@ Config::check_key_tables_consistency()
- std::string
- Config::default_temporary_dir(const std::string& cache_dir)
- {
--#ifdef HAVE_GETEUID
--  std::string user_tmp_dir = FMT("/run/user/{}", geteuid());
--  if (Stat::stat(user_tmp_dir).is_directory()) {
--    return user_tmp_dir + "/ccache-tmp";
--  }
--#endif
-   return cache_dir + "/tmp";
- }

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

[Sam James]

commit:     48e3b0e6647efb18f9573f1467ffc5abaaf8a11f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 13 16:43:24 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 18:05:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e3b0e6

dev-util/ccache: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31423
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/ccache/files/ccache-4.8.1-test-typo.patch | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/dev-util/ccache/files/ccache-4.8.1-test-typo.patch b/dev-util/ccache/files/ccache-4.8.1-test-typo.patch
deleted file mode 100644
index f557d24e6e93..000000000000
--- a/dev-util/ccache/files/ccache-4.8.1-test-typo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/ccache/ccache/pull/1287
-
-From efad3d7c1d18a260b694904fe695e6abd7dfd4df Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 20 May 2023 05:30:54 +0100
-Subject: [PATCH] test: Fix typo (missing line continuation)
-
-Fixes: ef634bdb292e1e24b8d1b5490e7857144a77c0fd
---- a/test/suites/base.bash
-+++ b/test/suites/base.bash
-@@ -552,7 +552,7 @@ fi
-     # -------------------------------------------------------------------------
-     TEST "Directory is not hashed if using -gz"
- 
--    if $COMPILER -c test1.c -gz 2>/dev/null
-+    if $COMPILER -c test1.c -gz 2>/dev/null \
-        && $COMPILER -E test1.c -gz >preprocessed.i 2>/dev/null \
-        && [ -s preprocessed.i ] \
-        && ! grep -Fq $PWD preprocessed.i; then
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

[Sam James]

commit:     5651f7d6d8ecf7ccbf4a192a0a84b749478ed1d9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 14:43:05 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 14:43:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5651f7d6

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 <AT> gentoo.org>

 .../ccache/files/ccache-4.10-unittest-httplib.patch    | 18 ++++++++++++++++--
 1 file 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)