commit: 118f77923e182362bb1bcb45756c4679251dcdbf Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Mon Mar 3 15:27:40 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Apr 5 00:39:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118f7792
dev-cpp/abseil-cpp: add 20250127.0, 20240722.1, 20240116.3, 20230802.3 Closes: https://bugs.gentoo.org/942192 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-cpp/abseil-cpp/Manifest | 5 +++ ...22.0-r1.ebuild => abseil-cpp-20230802.3.ebuild} | 24 +++++++++----- ...22.0-r1.ebuild => abseil-cpp-20240116.3.ebuild} | 22 +++++++++---- dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild | 1 + ...22.0-r1.ebuild => abseil-cpp-20240722.1.ebuild} | 14 +++++--- ...22.0-r1.ebuild => abseil-cpp-20250127.0.ebuild} | 33 ++++++++++++------- .../abseil-cpp-20240722.0-ciso646-cxx17.patch | 37 ++++++++++++++++++++++ 7 files changed, 105 insertions(+), 31 deletions(-) diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest index 190373fa4aab..936c01a30a89 100644 --- a/dev-cpp/abseil-cpp/Manifest +++ b/dev-cpp/abseil-cpp/Manifest @@ -3,8 +3,13 @@ DIST abseil-cpp-20220623.1.tar.gz 1957483 BLAKE2B 5bcf60b5a55882bcb78c7095a9892f DIST abseil-cpp-20230125.2.tar.gz 2119685 BLAKE2B 130e55c68acdec7af0f807189365a5206427fe0bcf564a2ece9837d84429505e763399384fae89a07db6b68ed18c63918dc5ae0e53e59cdb844e4d524932abf5 SHA512 b2ba5023610aacb680b22bef894372810e6e7df76e630e56ac2f4b9498f70a872171f4562f6560ab78e837437b7bcfd3c47bfc2a5bb7fb20f28ec490dc8ed61f DIST abseil-cpp-20230125.3.tar.gz 2119655 BLAKE2B 6c60201e4fc2cb5cd942fafb6023347739544f02fd257d003eeedff9e2e5137ee0c954342134d17a64844b9a5f309392a4c3ff9336907f35ba6c967ab03524ee SHA512 50509acfc4128fd31435631f71ac8cd0350acd9e290f78502723149016e7f07c9d84182ba99e0938b1873fecda09393d3fd7af8dabfb0d89cdcdd8a69a917e70 DIST abseil-cpp-20230802.0.tar.gz 2156669 BLAKE2B 34de2f949db3e7578cae39bdd851785fd5327a80662436e7d77f18e196cc28eb1b463e9f49c8fc66060073c6c88222015af8b41044d56af6811c8914e84fbea3 SHA512 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02 +DIST abseil-cpp-20230802.3.tar.gz 2157817 BLAKE2B 1fa88220b78ec714e5a50f79d7c9a258c65e64b0a98d9d3047cabbfd7e793ebfd35f90440621a69afb8dc840503b52c1a7c151af66235f1916101869d0db0e81 SHA512 9ae22d9d69a2225ce5fd6807b721434aea66b7d2244060e1d70f1ee6ed2b9c4e4ca56f7fc3785c8a67a7f483e5f0234e86184d382371bf681c08f1bdbfb0e8b9 DIST abseil-cpp-20240116.2.tar.gz 2151288 BLAKE2B 2e843e29869bf69e46ec48884cbd2ba955eab2329716c4df7b9be0ded550f976184b945587af08d01a7aa77560ae679191c1a1de51c75311d3a5ee87c15017c8 SHA512 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e +DIST abseil-cpp-20240116.3.tar.gz 2152015 BLAKE2B a499d01c13440b9b2788a8018777f8f08e653471b9d1549069007adc75bfae5ec7c37a545983b2077e4e39e3f459ab702d0d7d7828bcdc2583889fac15ee39f7 SHA512 8e7fb3aa355c56ae42820f5c53226091e01227f48c6ace05432b14ee0401cb62adbc67c520420b41cff512de3f6b09f96fadc58d36b8ebc649bd1c12c1fe8298 DIST abseil-cpp-20240722.0.tar.gz 2242861 BLAKE2B 6756f9a5f70656a6ef1985ba44af69a7fc3ab23b4be8a36ae39d7eedc318a4a9b0da08b31d26b3c46857913a757c916f0e31254278e080497807bed24e4978ce SHA512 bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31 +DIST abseil-cpp-20240722.1.tar.gz 2242894 BLAKE2B fc20e3bb734ae17cd7d808cdf08e624a511d77255d17023104d3f3a5ad4844bc0b0618a9792a06492da5287f4f5cd8151ebbf4ab7c703c62d9fcdc955928b944 SHA512 6062a10220d1250127e2216cea65833f10f37459331254b59df437b5061af81a9645cab39479700cf1843ef7dee51fe125241b0ecb9f715705a45dce4ffae89e +DIST abseil-cpp-20250127.0-PR1834.patch 968 BLAKE2B b563725afcae9fcbddde9aef1e492ed9ca13201a3cb817044c2fa62a8d47d79600a2b1cb6018bb12a21a27fe765ab4a6f1b43239401d97962fd794520cff3ded SHA512 28bd3cea659ba400da928d8ce2bdf6a8dd25a3991abdca74b6cf7893e0ac206eb95b6f94beeb0a02516b4403da20e088e42553705c024f5f5730281248c2acaf +DIST abseil-cpp-20250127.0.tar.gz 2267275 BLAKE2B 70fa05a0db91b9e7ccf9f2828a7bf4b7fe6d7177b5f2d17b2f2f6f2a5e83289674d624fa7983410713a2d62b1025a5b5d957f1ba11e01cb727fc771ce76bc914 SHA512 2a021faad807ee3e23548716ffa4785dc2409edbb4be676cc4bc01d47885760de340f0a4afdcbf0aaa835affd6d78f7bc319bbf7d337dbc30e7a559d0088e4bd DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954 DIST gtest-e68764c147ea0dac1e8811925c531d937396878e.tar.gz 862129 BLAKE2B d6decb9d1ad4e379a76119ec984deaa7649fca033f225698ce421bcee1207b52da3c4fdb2f6d68b968248575704ebe501b7b1d0a02c180901ffa78f9aa47f549 SHA512 aca72b5f64894aeee34cb869bdeda2d25ec04e901fe0e4e8d08d49472de1c9b19a97ba97a2e8570a88be74aea26d1cd526b4e605005a881e1cb6ab03ed3a4ceb diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild similarity index 71% copy from dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild copy to dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild index 829b2d4c0484..dd1810a5fe1a 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake-multilib python-any-r1 @@ -13,10 +13,14 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV:2:4}.$(ver_cut 2).0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86" IUSE="test" -RDEPEND=">=dev-cpp/gtest-1.13.0:=[${MULTILIB_USEDEP}]" +RDEPEND=" + test? ( + dev-cpp/gtest:=[${MULTILIB_USEDEP}] + ) +" DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} @@ -29,10 +33,10 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" - # "${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-lto-odr.patch" + "${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() { @@ -46,6 +50,7 @@ src_prepare() { -e '/"-msse4.1",/d' \ -e '/"-mfpu=neon"/d' \ -e '/"-march=armv8-a+crypto"/d' \ + -e '/NOMINMAX/d' \ absl/copts/copts.py || die # now generate cmake files @@ -55,11 +60,14 @@ src_prepare() { multilib_src_configure() { local mycmakeargs=( + # We use -std=c++14 here so that abseil-cpp's string_view is used + # See the discussion in https://github.com/gentoo/gentoo/pull/32281. + -DCMAKE_CXX_STANDARD=14 -DABSL_ENABLE_INSTALL=TRUE -DABSL_USE_EXTERNAL_GOOGLETEST=ON -DABSL_PROPAGATE_CXX_STD=TRUE # TEST_HELPERS needed for protobuf (bug #915902) - -DABSL_BUILD_TEST_HELPERS=ON + -DABSL_BUILD_TEST_HELPERS="$(usex test)" -DABSL_BUILD_TESTING="$(usex test)" ) # intentional use, it uses both variables for tests. diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild similarity index 72% copy from dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild copy to dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild index 829b2d4c0484..9f5cd6299aed 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake-multilib python-any-r1 @@ -13,10 +13,14 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV:2:4}.$(ver_cut 2).0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" IUSE="test" -RDEPEND=">=dev-cpp/gtest-1.13.0:=[${MULTILIB_USEDEP}]" +RDEPEND=" + test? ( + dev-cpp/gtest:=[${MULTILIB_USEDEP}] + ) +" DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} @@ -29,10 +33,10 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" - # "${FILESDIR}/${PN}-random-tests.patch" #935417 - # "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 + "${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-lto-odr.patch" + "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" ) src_prepare() { @@ -46,6 +50,7 @@ src_prepare() { -e '/"-msse4.1",/d' \ -e '/"-mfpu=neon"/d' \ -e '/"-march=armv8-a+crypto"/d' \ + -e '/NOMINMAX/d' \ absl/copts/copts.py || die # now generate cmake files @@ -55,11 +60,14 @@ src_prepare() { multilib_src_configure() { local mycmakeargs=( + # We use -std=c++14 here so that abseil-cpp's string_view is used + # See the discussion in https://github.com/gentoo/gentoo/pull/32281. + -DCMAKE_CXX_STANDARD=14 -DABSL_ENABLE_INSTALL=TRUE -DABSL_USE_EXTERNAL_GOOGLETEST=ON -DABSL_PROPAGATE_CXX_STD=TRUE # TEST_HELPERS needed for protobuf (bug #915902) - -DABSL_BUILD_TEST_HELPERS=ON + -DABSL_BUILD_TEST_HELPERS="$(usex test)" -DABSL_BUILD_TESTING="$(usex test)" ) # intentional use, it uses both variables for tests. diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild index 829b2d4c0484..09f1e9456316 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild @@ -46,6 +46,7 @@ src_prepare() { -e '/"-msse4.1",/d' \ -e '/"-mfpu=neon"/d' \ -e '/"-march=armv8-a+crypto"/d' \ + -e '/NOMINMAX/d' \ absl/copts/copts.py || die # now generate cmake files diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild similarity index 83% copy from dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild copy to dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild index 829b2d4c0484..980635fdd36e 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild @@ -13,10 +13,14 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV:2:4}.$(ver_cut 2).0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" IUSE="test" -RDEPEND=">=dev-cpp/gtest-1.13.0:=[${MULTILIB_USEDEP}]" +RDEPEND=" + test? ( + dev-cpp/gtest:=[${MULTILIB_USEDEP}] + ) +" DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} @@ -29,10 +33,9 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" - # "${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-lto-odr.patch" + "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" ) src_prepare() { @@ -46,6 +49,7 @@ src_prepare() { -e '/"-msse4.1",/d' \ -e '/"-mfpu=neon"/d' \ -e '/"-march=armv8-a+crypto"/d' \ + -e '/NOMINMAX/d' \ absl/copts/copts.py || die # now generate cmake files @@ -59,7 +63,7 @@ multilib_src_configure() { -DABSL_USE_EXTERNAL_GOOGLETEST=ON -DABSL_PROPAGATE_CXX_STD=TRUE # TEST_HELPERS needed for protobuf (bug #915902) - -DABSL_BUILD_TEST_HELPERS=ON + -DABSL_BUILD_TEST_HELPERS="$(usex test)" -DABSL_BUILD_TESTING="$(usex test)" ) # intentional use, it uses both variables for tests. diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild similarity index 68% copy from dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild copy to dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild index 829b2d4c0484..896be16ff5ca 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild @@ -9,14 +9,22 @@ inherit cmake-multilib python-any-r1 DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" HOMEPAGE="https://abseil.io/"; -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/abseil/abseil-cpp/commit/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch + -> ${PN}-20250127.0-PR1834.patch +" LICENSE="Apache-2.0" SLOT="0/${PV:2:4}.$(ver_cut 2).0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" IUSE="test" -RDEPEND=">=dev-cpp/gtest-1.13.0:=[${MULTILIB_USEDEP}]" +RDEPEND=" + test? ( + dev-cpp/gtest:=[${MULTILIB_USEDEP}] + ) +" DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} @@ -29,10 +37,9 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" - # "${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-lto-odr.patch" + "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" + "${DISTDIR}/${PN}-20250127.0-PR1834.patch" ) src_prepare() { @@ -41,11 +48,9 @@ src_prepare() { use ppc && eapply "${FILESDIR}/${PN}-atomic.patch" # un-hardcode abseil compiler flags + # 942192 sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ + -e '/NOMINMAX/d' \ absl/copts/copts.py || die # now generate cmake files @@ -59,7 +64,7 @@ multilib_src_configure() { -DABSL_USE_EXTERNAL_GOOGLETEST=ON -DABSL_PROPAGATE_CXX_STD=TRUE # TEST_HELPERS needed for protobuf (bug #915902) - -DABSL_BUILD_TEST_HELPERS=ON + -DABSL_BUILD_TEST_HELPERS="$(usex test)" -DABSL_BUILD_TESTING="$(usex test)" ) # intentional use, it uses both variables for tests. @@ -83,6 +88,12 @@ multilib_src_test() { absl_failure_signal_handler_test ) fi + else + if ! multilib_is_native_abi; then + CMAKE_SKIP_TESTS+=( + absl_hash_instantiated_test + ) + fi fi cmake_src_test 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 new file mode 100644 index 000000000000..8cc39ee9fc58 --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch @@ -0,0 +1,37 @@ +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 +
