1 |
commit: 61958b88555c08f099c70d0b1989b86bcd3f2465 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 30 15:23:27 2017 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 30 15:26:29 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61958b88 |
7 |
|
8 |
dev-lang/python: fix build failure in blake2 module |
9 |
|
10 |
Thanks to Johannes Hirte for the simple solution. |
11 |
|
12 |
Bug: https://bugs.gentoo.org/608586 |
13 |
Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1 |
14 |
|
15 |
dev-lang/python/files/3.6-blake2.patch | 37 ++++++++++++++++++++++++++++++++++ |
16 |
dev-lang/python/python-3.6.1-r1.ebuild | 1 + |
17 |
2 files changed, 38 insertions(+) |
18 |
|
19 |
diff --git a/dev-lang/python/files/3.6-blake2.patch b/dev-lang/python/files/3.6-blake2.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..48ee5855952 |
22 |
--- /dev/null |
23 |
+++ b/dev-lang/python/files/3.6-blake2.patch |
24 |
@@ -0,0 +1,37 @@ |
25 |
+From 2e7c906c085a01ea8175a19e1e143257abc8f566 Mon Sep 17 00:00:00 2001 |
26 |
+From: Mike Gilbert <floppym@g.o> |
27 |
+Date: Sun, 30 Jul 2017 11:17:39 -0400 |
28 |
+Subject: [PATCH] blake2: remove commented code |
29 |
+ |
30 |
+The nested comments cause a build failure. |
31 |
+ |
32 |
+Bug: https://bugs.gentoo.org/608586 |
33 |
+--- |
34 |
+ Modules/_blake2/impl/blake2s-load-xop.h | 11 ----------- |
35 |
+ 1 file changed, 11 deletions(-) |
36 |
+ |
37 |
+diff --git a/Modules/_blake2/impl/blake2s-load-xop.h b/Modules/_blake2/impl/blake2s-load-xop.h |
38 |
+index a3b5d65e2d..7e76c399c6 100644 |
39 |
+--- a/Modules/_blake2/impl/blake2s-load-xop.h |
40 |
++++ b/Modules/_blake2/impl/blake2s-load-xop.h |
41 |
+@@ -18,17 +18,6 @@ |
42 |
+ |
43 |
+ #define TOB(x) ((x)*4*0x01010101 + 0x03020100) /* ..or not TOB */ |
44 |
+ |
45 |
+-/* Basic VPPERM emulation, for testing purposes */ |
46 |
+-/*static __m128i _mm_perm_epi8(const __m128i src1, const __m128i src2, const __m128i sel) |
47 |
+-{ |
48 |
+- const __m128i sixteen = _mm_set1_epi8(16); |
49 |
+- const __m128i t0 = _mm_shuffle_epi8(src1, sel); |
50 |
+- const __m128i s1 = _mm_shuffle_epi8(src2, _mm_sub_epi8(sel, sixteen)); |
51 |
+- const __m128i mask = _mm_or_si128(_mm_cmpeq_epi8(sel, sixteen), |
52 |
+- _mm_cmpgt_epi8(sel, sixteen)); /* (>=16) = 0xff : 00 */ |
53 |
+- return _mm_blendv_epi8(t0, s1, mask); |
54 |
+-}*/ |
55 |
+- |
56 |
+ #define LOAD_MSG_0_1(buf) \ |
57 |
+ buf = _mm_perm_epi8(m0, m1, _mm_set_epi32(TOB(6),TOB(4),TOB(2),TOB(0)) ); |
58 |
+ |
59 |
+-- |
60 |
+2.13.3 |
61 |
+ |
62 |
|
63 |
diff --git a/dev-lang/python/python-3.6.1-r1.ebuild b/dev-lang/python/python-3.6.1-r1.ebuild |
64 |
index eef0e26c7dc..ef6e62034cd 100644 |
65 |
--- a/dev-lang/python/python-3.6.1-r1.ebuild |
66 |
+++ b/dev-lang/python/python-3.6.1-r1.ebuild |
67 |
@@ -65,6 +65,7 @@ src_prepare() { |
68 |
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" |
69 |
epatch "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch" |
70 |
epatch "${FILESDIR}/3.6.1-test_socket-AEAD.patch" |
71 |
+ epatch "${FILESDIR}/3.6-blake2.patch" |
72 |
|
73 |
epatch_user |