From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3B9A8138827 for ; Fri, 2 Oct 2015 13:56:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE5ED21C033; Fri, 2 Oct 2015 13:56:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 814BC21C033 for ; Fri, 2 Oct 2015 13:56:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 241A333BF44 for ; Fri, 2 Oct 2015 13:56:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30A341FB for ; Fri, 2 Oct 2015 13:56:39 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1443794193.bd3586765e47208668f27f707ec7f6d06b5d92a8.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/python/, dev-lang/python/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/python/files/python-3.4-gcc-5.patch dev-lang/python/python-3.3.5-r2.ebuild dev-lang/python/python-3.4.3-r2.ebuild X-VCS-Directories: dev-lang/python/ dev-lang/python/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: bd3586765e47208668f27f707ec7f6d06b5d92a8 X-VCS-Branch: master Date: Fri, 2 Oct 2015 13:56:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5d892d66-45c8-4923-a7fc-867cd94af131 X-Archives-Hash: 24ca5c20407ad7f99d11cde2a5893491 commit: bd3586765e47208668f27f707ec7f6d06b5d92a8 Author: Mike Frysinger gentoo org> AuthorDate: Fri Oct 2 13:56:16 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Fri Oct 2 13:56:33 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd358676 dev-lang/python: add upstream fix for testing w/gcc-5 #547626 dev-lang/python/files/python-3.4-gcc-5.patch | 37 ++++++++++++++++++++++++++++ dev-lang/python/python-3.3.5-r2.ebuild | 1 + dev-lang/python/python-3.4.3-r2.ebuild | 1 + 3 files changed, 39 insertions(+) diff --git a/dev-lang/python/files/python-3.4-gcc-5.patch b/dev-lang/python/files/python-3.4-gcc-5.patch new file mode 100644 index 0000000..80afbd1 --- /dev/null +++ b/dev-lang/python/files/python-3.4-gcc-5.patch @@ -0,0 +1,37 @@ +changeset: 94583:689092296ad3 +branch: 3.4 +parent: 94579:645f3d750be1 +user: Victor Stinner +date: Wed Feb 11 14:23:35 2015 +0100 +summary: Issue #23433: Fix faulthandler._stack_overflow() + +diff -r 645f3d750be1 -r 689092296ad3 Modules/faulthandler.c +--- a/Modules/faulthandler.c Tue Feb 10 14:49:32 2015 +0100 ++++ b/Modules/faulthandler.c Wed Feb 11 14:23:35 2015 +0100 +@@ -911,12 +911,12 @@ + } + + #if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION) +-static void* +-stack_overflow(void *min_sp, void *max_sp, size_t *depth) ++static Py_uintptr_t ++stack_overflow(Py_uintptr_t min_sp, Py_uintptr_t max_sp, size_t *depth) + { + /* allocate 4096 bytes on the stack at each call */ + unsigned char buffer[4096]; +- void *sp = &buffer; ++ Py_uintptr_t sp = (Py_uintptr_t)&buffer; + *depth += 1; + if (sp < min_sp || max_sp < sp) + return sp; +@@ -929,7 +929,8 @@ + faulthandler_stack_overflow(PyObject *self) + { + size_t depth, size; +- char *sp = (char *)&depth, *stop; ++ Py_uintptr_t sp = (Py_uintptr_t)&depth; ++ Py_uintptr_t stop; + + depth = 0; + stop = stack_overflow(sp - STACK_OVERFLOW_MAX_SIZE, + diff --git a/dev-lang/python/python-3.3.5-r2.ebuild b/dev-lang/python/python-3.3.5-r2.ebuild index 59fc5b7..f14b121 100644 --- a/dev-lang/python/python-3.3.5-r2.ebuild +++ b/dev-lang/python/python-3.3.5-r2.ebuild @@ -75,6 +75,7 @@ src_prepare() { EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" epatch "${FILESDIR}/${PN}-3.3.5-ncurses-pkg-config.patch" + epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626 sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ Lib/distutils/command/install.py \ diff --git a/dev-lang/python/python-3.4.3-r2.ebuild b/dev-lang/python/python-3.4.3-r2.ebuild index 888e7a7..80d86b6 100644 --- a/dev-lang/python/python-3.4.3-r2.ebuild +++ b/dev-lang/python/python-3.4.3-r2.ebuild @@ -70,6 +70,7 @@ src_prepare() { EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch" + epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626 sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ Lib/distutils/command/install.py \