diff options
Diffstat (limited to 'dev-cpp/abseil-cpp')
| -rw-r--r-- | dev-cpp/abseil-cpp/Manifest | 2 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20220623.0.ebuild (renamed from dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild) | 10 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch | 23 |
3 files changed, 4 insertions, 31 deletions
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest index 7c46bd9d4f08..433fc0975619 100644 --- a/dev-cpp/abseil-cpp/Manifest +++ b/dev-cpp/abseil-cpp/Manifest @@ -1,3 +1,3 @@ -DIST abseil-cpp-20210324.2.tar.gz 1774172 BLAKE2B f33ebe830bcece41d76c4de8f514e32a2515be8a78b6cc7a8877ba72284be62649e345dea224976e78e8dcf7fd957e249c92f7c89e92ae44e984fe294df711fc SHA512 7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27 DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf +DIST abseil-cpp-20220623.0.tar.gz 1957466 BLAKE2B ec2fb0564e647959c3e0d19389eb5fb0005f5818b2c7695cddd287cfebdf1f388bcdcd10f6191ba80f25221349d2ad630f18eb403973087e74e51172719d1606 SHA512 6a84254927cac285c77f6b2e77de23ce4f65c28acc0289228f3db552e247fb1dedf2c6e51a98da7df700c062612e27e6acd029122e8abc3fff12f3f5502c8c10 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20220623.0.ebuild index cffd42ff4462..d8949f5e004c 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20220623.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 2021 Liguros Authors +# Copyright 2021-2022 Liguros Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{7,8,9,10} ) @@ -12,7 +12,7 @@ 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 +SRC_URI="https://github.com/abseil/abseil-cpp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" LICENSE=" @@ -33,10 +33,6 @@ BDEPEND=" RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}/${PN}-20200923-arm_no_crypto.patch" -) - src_prepare() { cmake_src_prepare 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 deleted file mode 100644 index 762476a10184..000000000000 --- a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 ---- /absl/random/internal/randen_hwaes.cc -+++ /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 |
