From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3D002138334 for ; Thu, 15 Aug 2019 08:10:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7907FE077F; Thu, 15 Aug 2019 08:10:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3EE9CE077F for ; Thu, 15 Aug 2019 08:10:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 51BD0349B62 for ; Thu, 15 Aug 2019 08:10:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05DB52A5 for ; Thu, 15 Aug 2019 08:10:34 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1565856631.6800eaeb8bc9bcaaf1169b404d6509d68be71a63.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy3/pypy3-7.1.1.ebuild dev-python/pypy3/pypy3-9999.ebuild X-VCS-Directories: dev-python/pypy3/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6800eaeb8bc9bcaaf1169b404d6509d68be71a63 X-VCS-Branch: master Date: Thu, 15 Aug 2019 08:10:34 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5ca6231b-231b-4ba7-a9cd-9439bd68496e X-Archives-Hash: 2d9b8efe76a693c0c4348c7df71be067 commit: 6800eaeb8bc9bcaaf1169b404d6509d68be71a63 Author: Michał Górny gentoo org> AuthorDate: Thu Aug 15 08:09:01 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Aug 15 08:10:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6800eaeb dev-python/pypy3: Restore non-SSE2 x86 backend Signed-off-by: Michał Górny gentoo.org> dev-python/pypy3/pypy3-7.1.1.ebuild | 25 +++++++++++++++++++++++-- dev-python/pypy3/pypy3-9999.ebuild | 25 +++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dev-python/pypy3/pypy3-7.1.1.ebuild b/dev-python/pypy3/pypy3-7.1.1.ebuild index f0f7cdf74a2..344f0da4013 100644 --- a/dev-python/pypy3/pypy3-7.1.1.ebuild +++ b/dev-python/pypy3/pypy3-7.1.1.ebuild @@ -17,7 +17,8 @@ LICENSE="MIT" # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' SLOT="0/71-py36" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk" +IUSE="bzip2 cpu_flags_x86_sse2 gdbm +jit libressl low-memory ncurses + sandbox sqlite tk" RDEPEND=">=sys-libs/zlib-1.1.3:0= virtual/libffi:0= @@ -103,12 +104,32 @@ src_prepare() { src_configure() { tc-export CC + local jit_backend + if use jit; then + jit_backend='--jit-backend=' + + # We only need the explicit sse2 switch for x86. + # On other arches we can rely on autodetection which uses + # compiler macros. Plus, --jit-backend= doesn't accept all + # the modern values... + + if use x86; then + if use cpu_flags_x86_sse2; then + jit_backend+=x86 + else + jit_backend+=x86-without-sse2 + fi + else + jit_backend+=auto + fi + fi + local args=( --shared $(usex jit -Ojit -O2) $(usex sandbox --sandbox '') - --jit-backend=auto + ${jit_backend} pypy/goal/targetpypystandalone ) diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild index ca7aae03fe8..d6e6b0856ea 100644 --- a/dev-python/pypy3/pypy3-9999.ebuild +++ b/dev-python/pypy3/pypy3-9999.ebuild @@ -20,7 +20,8 @@ LICENSE="MIT" # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' SLOT="0/71-py36" KEYWORDS="" -IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk" +IUSE="bzip2 cpu_flags_x86_sse2 gdbm +jit libressl low-memory ncurses + sandbox sqlite tk" RDEPEND=">=sys-libs/zlib-1.1.3:0= virtual/libffi:0= @@ -111,12 +112,32 @@ src_prepare() { src_configure() { tc-export CC + local jit_backend + if use jit; then + jit_backend='--jit-backend=' + + # We only need the explicit sse2 switch for x86. + # On other arches we can rely on autodetection which uses + # compiler macros. Plus, --jit-backend= doesn't accept all + # the modern values... + + if use x86; then + if use cpu_flags_x86_sse2; then + jit_backend+=x86 + else + jit_backend+=x86-without-sse2 + fi + else + jit_backend+=auto + fi + fi + local args=( --shared $(usex jit -Ojit -O2) $(usex sandbox --sandbox '') - --jit-backend=auto + ${jit_backend} pypy/goal/targetpypystandalone )