Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe/, dev-python/pypy3-exe/files/
Date: Wed, 26 Feb 2020 12:12:43
Message-Id: 1582719140.a228f0e10efcfef0855e43f10539910db08b2f8f.soap@gentoo
1 commit: a228f0e10efcfef0855e43f10539910db08b2f8f
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 26 12:12:20 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 26 12:12:20 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a228f0e1
7
8 dev-python/pypy3-exe: Fix GCC 10 / -fno-common
9
10 Closes: https://bugs.gentoo.org/706760
11 Package-Manager: Portage-2.3.89, Repoman-2.3.20
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 .../files/pypy3-exe-7.3.0-gcc10-fno-common.patch | 25 ++++++++++++++++++++++
15 dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild | 5 +++++
16 2 files changed, 30 insertions(+)
17
18 diff --git a/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch b/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch
19 new file mode 100644
20 index 00000000000..b072ee4c1e6
21 --- /dev/null
22 +++ b/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch
23 @@ -0,0 +1,25 @@
24 +From 455e1f635110df4bdc2981a3a0abf02e3d4d21b2 Mon Sep 17 00:00:00 2001
25 +From: Matti Picus <matti.picus@×××××.com>
26 +Date: Wed, 26 Feb 2020 13:06:29 +0200
27 +Subject: [PATCH] issue 3163: the constant is defined both in vmprof_common.h and vmprof_common.c
28 +
29 +---
30 + rpython/rlib/rvmprof/src/shared/vmprof_common.h | 2 +-
31 + 1 file changed, 1 insertion(+), 1 deletion(-)
32 +
33 +diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_common.h b/rpython/rlib/rvmprof/src/shared/vmprof_common.h
34 +index b52ee5f..1b2278b 100644
35 +--- a/rpython/rlib/rvmprof/src/shared/vmprof_common.h
36 ++++ b/rpython/rlib/rvmprof/src/shared/vmprof_common.h
37 +@@ -89,7 +89,7 @@ int opened_profile(const char *interp_name, int memory, int proflines, int nativ
38 + result is NULL. */
39 + #if PY_MAJOR_VERSION >= 3 && !defined(_Py_atomic_load_relaxed)
40 + /* this was abruptly un-defined in 3.5.1 */
41 +-void *volatile _PyThreadState_Current;
42 ++extern void *volatile _PyThreadState_Current;
43 + /* XXX simple volatile access is assumed atomic */
44 + # define _Py_atomic_load_relaxed(pp) (*(pp))
45 + #endif
46 +--
47 +libgit2 0.26.0
48 +
49
50 diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
51 index 3555bbb629d..16932248fb9 100644
52 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
53 +++ b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
54 @@ -38,6 +38,11 @@ BDEPEND="
55 )
56 )"
57
58 +PATCHES=(
59 + # https://bugs.gentoo.org/706760
60 + "${FILESDIR}"/${PN}-7.3.0-gcc10-fno-common.patch
61 +)
62 +
63 check_env() {
64 if use low-memory; then
65 CHECKREQS_MEMORY="1750M"