diff options
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/abseil-cpp/Manifest | 9 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild | 79 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild | 75 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild (renamed from dev-cpp/abseil-cpp/abseil-cpp-20230125.1.ebuild) | 15 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild | 16 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch | 23 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch | 14 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch | 51 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch | 22 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch | 24 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch | 18 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/metadata.xml | 6 |
12 files changed, 330 insertions, 22 deletions
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest index dc74d9b96860..dcf044de0d14 100644 --- a/dev-cpp/abseil-cpp/Manifest +++ b/dev-cpp/abseil-cpp/Manifest @@ -1,3 +1,8 @@ -DIST abseil-cpp-20230125.1.tar.gz 2119641 BLAKE2B 964ccc8f77d4e3b819eb66daf8d610c8aa7ec87543813a5272d143eca50a5faaa00d190bcc10db1f7e259abbcd18f360d8c7f79d9b4bd156976cdc12cbc78a13 SHA512 160764e2d10f1a5970b6ea7323868d231070c57b48fcc92e3614bca9d0e9ee0a571b66dfdc560934883de542f32dfbb1ba7b03c11bda8f03e63a5f31e273be6a +DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85 +DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf +DIST abseil-cpp-20220623.1.tar.gz 1957483 BLAKE2B 5bcf60b5a55882bcb78c7095a9892f6d1e5819fb116e325a8299fb22780ab009f0e1d92d5d8aca5ae0d4acc6d60e620e3357a24e389059f6e75d94f1cbdc1ced SHA512 ab4fccd9a2bfa0c5ad4b56c8e8f8b7ec7a8eca8b6cc6959802acadd1da785e1feb078c6ac621808cd699c82717a9e637dc426d94b70a8db7f2a807059d41cbc2 DIST abseil-cpp-20230125.2.tar.gz 2119685 BLAKE2B 130e55c68acdec7af0f807189365a5206427fe0bcf564a2ece9837d84429505e763399384fae89a07db6b68ed18c63918dc5ae0e53e59cdb844e4d524932abf5 SHA512 b2ba5023610aacb680b22bef894372810e6e7df76e630e56ac2f4b9498f70a872171f4562f6560ab78e837437b7bcfd3c47bfc2a5bb7fb20f28ec490dc8ed61f -DIST gtest-release-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e +DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b +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-20200923.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild new file mode 100644 index 000000000000..f3d696d8c37a --- /dev/null +++ b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild @@ -0,0 +1,79 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9,10,11} ) + +inherit cmake flag-o-matic python-any-r1 toolchain-funcs + +# yes, it needs SOURCE, not just installed one +GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e" +GTEST_FILE="gtest-1.10.0_p20200702.tar.gz" + +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 + https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE}" + +LICENSE=" + Apache-2.0 + test? ( BSD ) +" +SLOT="0/${PV%%.*}" +KEYWORDS="amd64 ~arm64 ~ppc64 x86" +IUSE="+cxx17 test" + +DEPEND="" +RDEPEND="${DEPEND}" + +BDEPEND=" + ${PYTHON_DEPS} + test? ( sys-libs/timezone-data ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-20200923-arm_no_crypto.patch" + "${FILESDIR}/${PN}-20211102.0-r2-gcc-13.patch" + "${FILESDIR}/${PN}-20210324.1-glibc-2.34.patch" +) + +src_prepare() { + cmake_src_prepare + + # un-hardcode abseil compiler flags + sed -i \ + -e '/"-maes",/d' \ + -e '/"-msse4.1",/d' \ + -e '/"-mfpu=neon"/d' \ + -e '/"-march=armv8-a+crypto"/d' \ + absl/copts/copts.py || die + + # now generate cmake files + python_fix_shebang absl/copts/generate_copts.py + absl/copts/generate_copts.py || die + + sed -i 's/-Werror//g' \ + "${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die +} + +src_configure() { + if use arm || use arm64; then + # bug #778926 + if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then + append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO + fi + fi + + local mycmakeargs=( + -DABSL_ENABLE_INSTALL=TRUE + -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" + -DABSL_RUN_TESTS=$(usex test) + -DBUILD_SHARED_LIBS=TRUE + $(usex cxx17 -DCMAKE_CXX_STANDARD=17 '') # it has to be a useflag for some consumers + $(usex test -DBUILD_TESTING=ON '') #intentional usex + ) + cmake_src_configure +} diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild new file mode 100644 index 000000000000..600f4a5a666f --- /dev/null +++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{7,8,9,10,11} ) + +inherit cmake python-any-r1 + +# yes, it needs SOURCE, not just installed one +# and no, 1.11.0 is not enough +GTEST_COMMIT="1b18723e874b256c1e39378c6774a90701d70f7a" +GTEST_FILE="gtest-${GTEST_COMMIT}.tar.gz" + +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 + test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" + +LICENSE=" + Apache-2.0 + test? ( BSD ) +" +SLOT="0/${PV%%.*}" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" +IUSE="test" + +DEPEND="" +RDEPEND="${DEPEND}" + +BDEPEND=" + ${PYTHON_DEPS} + test? ( sys-libs/timezone-data ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-20211102.0-fix-cuda-nvcc-build.patch" + "${FILESDIR}/${PN}-20211102.0-r2-cuda11.6-compile-fix.patch" + "${FILESDIR}/${PN}-20211102.0-r2-loong.patch" + "${FILESDIR}/${PN}-20211102.0-r2-gcc-13.patch" +) + +src_prepare() { + cmake_src_prepare + + # un-hardcode abseil compiler flags + sed -i \ + -e '/"-maes",/d' \ + -e '/"-msse4.1",/d' \ + -e '/"-mfpu=neon"/d' \ + -e '/"-march=armv8-a+crypto"/d' \ + absl/copts/copts.py || die + + # now generate cmake files + python_fix_shebang absl/copts/generate_copts.py + absl/copts/generate_copts.py || die + + if use test; then + sed -i 's/-Werror//g' \ + "${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die + fi +} + +src_configure() { + local mycmakeargs=( + -DABSL_ENABLE_INSTALL=TRUE + -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" + -DCMAKE_CXX_STANDARD=17 + -DABSL_PROPAGATE_CXX_STD=TRUE + $(usex test -DBUILD_TESTING=ON '') #intentional usex + ) + cmake_src_configure +} diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild index 6bc6901e2b5b..9a6ec69bc61f 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild @@ -1,5 +1,6 @@ -# Copyright 2021-2023 Liguros Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 + EAPI=8 PYTHON_COMPAT=( python3_{7,8,9,10,11} ) @@ -7,21 +8,21 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} ) inherit cmake python-any-r1 # yes, it needs SOURCE, not just installed one -GTEST_COMMIT="v1.13.0" -GTEST_FILE="gtest-release-1.13.0.tar.gz" +# and no, 1.11.0 is not enough +GTEST_COMMIT="e68764c147ea0dac1e8811925c531d937396878e" +GTEST_FILE="gtest-${GTEST_COMMIT}.tar.gz" DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" HOMEPAGE="https://abseil.io" -SRC_URI=" - https://github.com/abseil/abseil-cpp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/google/googletest/archive/refs/tags/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" +SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" LICENSE=" Apache-2.0 test? ( BSD ) " SLOT="0/${PV%%.*}" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="test" DEPEND="" diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild index 6bc6901e2b5b..e33fd74369de 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild @@ -1,5 +1,6 @@ -# Copyright 2021-2023 Liguros Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 + EAPI=8 PYTHON_COMPAT=( python3_{7,8,9,10,11} ) @@ -8,20 +9,19 @@ inherit cmake python-any-r1 # yes, it needs SOURCE, not just installed one GTEST_COMMIT="v1.13.0" -GTEST_FILE="gtest-release-1.13.0.tar.gz" +GTEST_FILE="gtest-${GTEST_COMMIT#v}.tar.gz" DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" HOMEPAGE="https://abseil.io" -SRC_URI=" - https://github.com/abseil/abseil-cpp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/google/googletest/archive/refs/tags/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" +SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" LICENSE=" Apache-2.0 test? ( BSD ) " SLOT="0/${PV%%.*}" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="test" DEPEND="" @@ -51,7 +51,7 @@ src_prepare() { if use test; then sed -i 's/-Werror//g' \ - "${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die + "${WORKDIR}/googletest-${GTEST_COMMIT#v}"/googletest/cmake/internal_utils.cmake || die fi } @@ -59,7 +59,7 @@ src_configure() { local mycmakeargs=( -DCMAKE_CXX_STANDARD=17 -DABSL_ENABLE_INSTALL=TRUE - -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" + -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT#v}" -DABSL_PROPAGATE_CXX_STD=TRUE -DABSL_BUILD_TESTING=$(usex test ON OFF) $(usex test -DBUILD_TESTING=ON '') #intentional usex, it used both variables for tests. diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch new file mode 100644 index 000000000000..d9e9963f5bae --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch @@ -0,0 +1,23 @@ +Don't assume all ARM CPUs have crypto extensions. + +Requires an accompanying change in the ebuild to disable crypto +extensions (by passing -DABSL_ARCH_ARM_NO_CRYPTO). This could +be done by the build system instead in future. + +https://bugs.gentoo.org/778926 +--- a/absl/random/internal/randen_hwaes.cc ++++ b/absl/random/internal/randen_hwaes.cc +@@ -50,8 +50,11 @@ + (defined(__ARM_NEON) && defined(__ARM_FEATURE_CRYPTO)) + #define ABSL_RANDEN_HWAES_IMPL 1 + +-#elif ABSL_RANDOM_INTERNAL_AES_DISPATCH && !defined(__APPLE__) && \ +- (defined(__GNUC__) && __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 9) ++// When ABSL_ARCH_ARM_NO_CRYPTO is defined, then ARM CPU without ++// crypto extension is assumed. ++#elif !defined(ABSL_ARCH_ARM_NO_CRYPTO) && \ ++ (ABSL_RANDOM_INTERNAL_AES_DISPATCH && !defined(__APPLE__) && \ ++ (defined(__GNUC__) && __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 9)) + // ...or, on GCC, we can use an ASM directive to + // instruct the assember to allow crypto instructions. + #define ABSL_RANDEN_HWAES_IMPL 1 diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch new file mode 100644 index 000000000000..99b868d3101f --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/823990 +https://github.com/abseil/abseil-cpp/commit/a9831f1cbf93fb18dd951453635f488037454ce9.patch +--- a/absl/debugging/failure_signal_handler.cc ++++ b/absl/debugging/failure_signal_handler.cc +@@ -136,7 +136,8 @@ static bool SetupAlternateStackOnce() { + #else + const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; + #endif +- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; ++ size_t stack_size = ++ (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask; + #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ + defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) + // Account for sanitizer instrumentation requiring additional stack space. diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch new file mode 100644 index 000000000000..0933c62660a6 --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch @@ -0,0 +1,51 @@ +Fixes compile failure with CUDA nvcc +https://github.com/abseil/abseil-cpp/commit/5202173ca7671ebe241cb4d9447dc4b1f2d3ec10 +https://github.com/tensorflow/tensorflow/commit/e45ca6adf2458d4759e5c40f1f27bbf9505a3c79#diff-b79a9a542260a33fd122a5d1cdb923e08e16cbe321d69c014a9acdde34052b3dR235 + +From 5202173ca7671ebe241cb4d9447dc4b1f2d3ec10 Mon Sep 17 00:00:00 2001 +From: Abseil Team <absl-team@google.com> +Date: Tue, 1 Feb 2022 13:52:49 -0800 +Subject: [PATCH] Export of internal Abseil changes + +-- +121db1a08321eaa3006726cc32b459cf17880e35 by Derek Mauro <dmauro@google.com>: + +Internal change + +PiperOrigin-RevId: 425707805 + +-- +0dec484389bbb75aae0a412146e3564bf833a739 by Derek Mauro <dmauro@google.com>: + +macOS CI: Avoid depending on external sites like GitHub by prepopulating +dependencies and setting --distdir + +Our Linux CI does this, but for some reason was never enabled on macOS + +PiperOrigin-RevId: 425668638 +GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35 +Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea +--- a/absl/container/internal/inlined_vector.h ++++ b/absl/container/internal/inlined_vector.h +@@ -925,8 +925,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void { + inlined_ptr->GetSize()); + } + ABSL_INTERNAL_CATCH_ANY { +- allocated_ptr->SetAllocation( +- {allocated_storage_view.data, allocated_storage_view.capacity}); ++ allocated_ptr->SetAllocation(Allocation<A>{ ++ allocated_storage_view.data, allocated_storage_view.capacity}); + ABSL_INTERNAL_RETHROW; + } + +@@ -934,8 +934,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void { + inlined_ptr->GetInlinedData(), + inlined_ptr->GetSize()); + +- inlined_ptr->SetAllocation( +- {allocated_storage_view.data, allocated_storage_view.capacity}); ++ inlined_ptr->SetAllocation(Allocation<A>{allocated_storage_view.data, ++ allocated_storage_view.capacity}); + } + + swap(GetSizeAndIsAllocated(), other_storage_ptr->GetSizeAndIsAllocated()); diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch new file mode 100644 index 000000000000..28347d489c17 --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch @@ -0,0 +1,22 @@ +--- a/absl/strings/internal/string_constant.h ++++ b/absl/strings/internal/string_constant.h +@@ -35,12 +35,18 @@ namespace strings_internal { + // below. + template <typename T> + struct StringConstant { ++ private: ++ static constexpr bool ValidateConstant(absl::string_view view) { ++ return view.empty() || 2 * view[0] != 1; ++ } ++ ++public: + static constexpr absl::string_view value = T{}(); + constexpr absl::string_view operator()() const { return value; } + + // Check to be sure `view` points to constant data. + // Otherwise, it can't be constant evaluated. +- static_assert(value.empty() || 2 * value[0] != 1, ++ static_assert(ValidateConstant(value), + "The input string_view must point to constant data."); + }; + diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch new file mode 100644 index 000000000000..2a847be09e9a --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch @@ -0,0 +1,24 @@ +https://github.com/abseil/abseil-cpp/commit/36a4b073f1e7e02ed7d1ac140767e36f82f09b7c + +From 36a4b073f1e7e02ed7d1ac140767e36f82f09b7c Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Fri, 27 May 2022 22:27:58 +0100 +Subject: [PATCH] absl/strings/internal/str_format/extension.h: add missing + <stdint.h> include + +Without the change absl-cpp build fails on this week's gcc-13 snapshot as: + + /build/abseil-cpp/absl/strings/internal/str_format/extension.h:34:33: error: found ':' in nested-name-specifier, expected '::' + 34 | enum class FormatConversionChar : uint8_t; + | ^ + | :: +--- a/absl/strings/internal/str_format/extension.h ++++ b/absl/strings/internal/str_format/extension.h +@@ -17,6 +17,7 @@ + #define ABSL_STRINGS_INTERNAL_STR_FORMAT_EXTENSION_H_ + + #include <limits.h> ++#include <stdint.h> + + #include <cstddef> + #include <cstring> diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch new file mode 100644 index 000000000000..2031f9f33d88 --- /dev/null +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch @@ -0,0 +1,18 @@ +https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1 + +From 808bc202fc13e85a7948db0d7fb58f0f051200b1 Mon Sep 17 00:00:00 2001 +From: imaiguo <maaiguo@uniontech.com> +Date: Wed, 23 Feb 2022 22:56:32 +0800 +Subject: [PATCH] Add support of loongarch64 (#1110) + +--- a/absl/debugging/internal/examine_stack.cc ++++ b/absl/debugging/internal/examine_stack.cc +@@ -82,6 +82,8 @@ void* GetProgramCounter(void* vuc) { + return reinterpret_cast<void*>(context->uc_mcontext.gregs[16]); + #elif defined(__e2k__) + return reinterpret_cast<void*>(context->uc_mcontext.cr0_hi); ++#elif defined(__loongarch__) ++ return reinterpret_cast<void*>(context->uc_mcontext.__pc); + #else + #error "Undefined Architecture." + #endif diff --git a/dev-cpp/abseil-cpp/metadata.xml b/dev-cpp/abseil-cpp/metadata.xml index 79d63bfbb0a6..27cd2fa04fab 100644 --- a/dev-cpp/abseil-cpp/metadata.xml +++ b/dev-cpp/abseil-cpp/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>dev@liguros.net</email> - <name>Development</name> - </maintainer> <maintainer type="person"> <email>gyakovlev@gentoo.org</email> <name>Georgy Yakovlev</name> @@ -13,5 +9,5 @@ <use> <flag name="cxx17">Build with -DCMAKE_CXX_STANDARD=17 (required by some revdeps)</flag> </use> - <origin>ports</origin> + <origin>gentoo-staging</origin> </pkgmetadata>
\ No newline at end of file |
