Attachment #696078 for bug #778926

View | Details | Raw Unified | Return to bug 778926
Collapse All | Expand All

Lines 1-11 Link Here

(-)a/dev-cpp/abseil-cpp/abseil-cpp-20200923.2.ebuild (-2 / +12 lines)
1	# Copyright 2020 Gentoo Authors	1	# Copyright 2020-2021 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
4	EAPI=7	4	EAPI=7
5		5
6	PYTHON_COMPAT=( python3_{7,8,9} )	6	PYTHON_COMPAT=( python3_{7,8,9} )
7		7
8	inherit cmake python-any-r1	8	inherit cmake python-any-r1 toolchain-funcs
9		9
10	# yes, it needs SOURCE, not just installed one	10	# yes, it needs SOURCE, not just installed one
11	GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"	11	GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
Lines 34-39 BDEPEND=" Link Here
34		34
35	RESTRICT="!test? ( test )"	35	RESTRICT="!test? ( test )"
36		36
		37	PATCHES=(
		38	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
		39	)
		40
37	src_prepare() {	41	src_prepare() {
38	cmake_src_prepare	42	cmake_src_prepare
39		43
Lines 53-58 src_prepare() { Link Here
53	}	57	}
54		58
55	src_configure() {	59	src_configure() {
		60	if use arm \|\| use arm64; then
		61	if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != HAVE_ARM_FEATURE_CRYPTO ]]; then
		62	append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO
		63	fi
		64	fi
		65
56	local mycmakeargs=(	66	local mycmakeargs=(
57	-DABSL_ENABLE_INSTALL=TRUE	67	-DABSL_ENABLE_INSTALL=TRUE
58	-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"	68	-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"




--- /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

Return to bug 778926

Line 0 Link Here

(-)a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch (-1 / +16 lines)
0	-	1	--- /absl/random/internal/randen_hwaes.cc
		2	+++ /absl/random/internal/randen_hwaes.cc
		3	@@ -50,8 +50,11 @@
		4	(defined(__ARM_NEON) && defined(__ARM_FEATURE_CRYPTO))
		5	#define ABSL_RANDEN_HWAES_IMPL 1
		6
		7	-#elif ABSL_RANDOM_INTERNAL_AES_DISPATCH && !defined(__APPLE__) && \
		8	- (defined(__GNUC__) && __GNUC__ > 4 \|\| __GNUC__ == 4 && __GNUC_MINOR__ > 9)
		9	+// When ABSL_ARCH_ARM_NO_CRYPTO is defined, then ARM CPU without
		10	+// crypto extension is assumed.
		11	+#elif !defined(ABSL_ARCH_ARM_NO_CRYPTO) && \
		12	+ (ABSL_RANDOM_INTERNAL_AES_DISPATCH && !defined(__APPLE__) && \
		13	+ (defined(__GNUC__) && __GNUC__ > 4 \|\| __GNUC__ == 4 && __GNUC_MINOR__ > 9))
		14	// ...or, on GCC, we can use an ASM directive to
		15	// instruct the assember to allow crypto instructions.
		16	#define ABSL_RANDEN_HWAES_IMPL 1