commit: 22b30e5a93ae51e3d1b891f66b6e4db6b3dbc92c Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Sun Jul 20 18:31:21 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Aug 1 08:08:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b30e5a
dev-cpp/abseil-cpp: drop obsolete ciso646 workaround This has been fix in gcc by now. Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43085 Closes: https://github.com/gentoo/gentoo/pull/43085 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild | 1 - dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild | 1 - dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild | 1 - dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild | 1 - dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild | 1 - .../abseil-cpp-20240722.0-ciso646-cxx17.patch | 37 ---------------------- 6 files changed, 42 deletions(-) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild index 020e26fc0ec0..1c81b0bb09fb 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild @@ -36,7 +36,6 @@ PATCHES=( "${FILESDIR}/${PN}-random-tests.patch" #935417 "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 "${FILESDIR}/${PN}-include-cstdint.patch" - "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" ) src_prepare() { diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild index e99a4b190279..ee464962941d 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild @@ -36,7 +36,6 @@ PATCHES=( "${FILESDIR}/${PN}-random-tests.patch" #935417 "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 "${FILESDIR}/${PN}-include-cstdint.patch" #937307 - "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" ) src_prepare() { diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild index 8fffaba1bbb5..1aa778570e64 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild @@ -38,7 +38,6 @@ PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" "${FILESDIR}/${PN}-include-cstdint.patch" #937307 "${FILESDIR}/${PN}-20240722.0-lto-odr.patch" - "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" ) src_prepare() { diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild index 89583d7032e8..4dd9b57af1f8 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild @@ -41,7 +41,6 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" "${FILESDIR}/${PN}-20240722.0-lto-odr.patch" - "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" "${DISTDIR}/${PN}-20250127.0-PR1834.patch" ) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild index 2ae9c60bc5d6..13e80e90f597 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild @@ -41,7 +41,6 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" "${FILESDIR}/${PN}-20240722.0-lto-odr.patch" - "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" "${DISTDIR}/${PN}-20250127.0-PR1834.patch" ) diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch deleted file mode 100644 index 8cc39ee9fc58..000000000000 --- a/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6be17375f9142017d34bd0b577cdf4e91225c135 Mon Sep 17 00:00:00 2001 -From: Paul Zander <[email protected]> -Date: Fri, 22 Nov 2024 19:46:05 +0100 -Subject: [PATCH] don't include <ciso646> with c++17 - -[179/825] Building CXX object absl/log/CMakeFiles/log_globals.dir/globals.cc.o -In file included from -/var/tmp/paludis/dev-cpp-abseil-cpp-20240722.0/work/abseil-cpp-20240722.0/absl/hash/internal/hash.h:33, -from -/var/tmp/paludis/dev-cpp-abseil-cpp-20240722.0/work/abseil-cpp-20240722.0/absl/hash/hash.h:85, -from -/var/tmp/paludis/dev-cpp-abseil-cpp-20240722.0/work/abseil-cpp-20240722.0/absl/log/globals.cc:29: -/usr/lib/gcc/x86_64-pc-linux-gnu/15/include/g++-v15/ciso646:46:4: warning: -#warning "<ciso646> is deprecated in C++17, use <version> to detect -implementation-specific macros" [-Wcpp] -46 | # warning "<ciso646> is deprecated in C++17, use <version> to detect -implementation-specific macros" - | ^~~~~~~ - -Signed-off-by: Paul Zander <[email protected]> - -diff --git a/absl/hash/internal/hash.h b/absl/hash/internal/hash.h -index 03bf183..3222be3 100644 ---- a/absl/hash/internal/hash.h -+++ b/absl/hash/internal/hash.h -@@ -27,7 +27,7 @@ - #include "absl/base/config.h" - - // For feature testing and determining which headers can be included. --#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L -+#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 201703L - #include <version> - #else - #include <ciso646> --- -2.47.0 -
