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 E450D1396D9 for ; Tue, 24 Oct 2017 17:34:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29C5D2BC004; Tue, 24 Oct 2017 17:34:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 087482BC004 for ; Tue, 24 Oct 2017 17:34:19 +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 84B0D33BEC7 for ; Tue, 24 Oct 2017 17:34:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E82682A for ; Tue, 24 Oct 2017 17:34:17 +0000 (UTC) From: "Mike Gilbert" 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 Gilbert" Message-ID: <1508866432.aca68ed6f1e01986b21edc552f50c879e073ca9d.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyblake2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pyblake2/pyblake2-0.9.3.ebuild X-VCS-Directories: dev-python/pyblake2/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: aca68ed6f1e01986b21edc552f50c879e073ca9d X-VCS-Branch: master Date: Tue, 24 Oct 2017 17:34:17 +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: d12664eb-92cd-45ee-91eb-6de77d59356e X-Archives-Hash: 7af17fb7bb33dec51ab6f23228d7c3fb commit: aca68ed6f1e01986b21edc552f50c879e073ca9d Author: Mike Gilbert gentoo org> AuthorDate: Mon Oct 23 16:40:50 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Oct 24 17:33:52 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca68ed6 dev-python/pyblake2: select implementation using compiler macros This eliminates the need for the cpu_flags_x86 USE flags, and resolves a build failure if CFLAGS and cpu_flags_x86 are mismatched. Package-Manager: Portage-2.3.11_p4, Repoman-2.3.3_p62 dev-python/pyblake2/pyblake2-0.9.3.ebuild | 37 ++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/dev-python/pyblake2/pyblake2-0.9.3.ebuild b/dev-python/pyblake2/pyblake2-0.9.3.ebuild index cdfe223ded1..b0c84ac4968 100644 --- a/dev-python/pyblake2/pyblake2-0.9.3.ebuild +++ b/dev-python/pyblake2/pyblake2-0.9.3.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) -inherit distutils-r1 flag-o-matic +inherit distutils-r1 flag-o-matic toolchain-funcs DESCRIPTION="BLAKE2 hash function extension module" HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2" @@ -13,18 +13,35 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" LICENSE="CC0-1.0" SLOT="0" KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="cpu_flags_x86_ssse3 cpu_flags_x86_avx cpu_flags_x86_xop" -python_prepare_all() { - local impl=REGS - # note: SSE2 is 2.5x slower than pure REGS, so we ignore it - use cpu_flags_x86_ssse3 && impl=SSSE3 - # this does not actually do anything but implicitly enabled SSE4.1... - use cpu_flags_x86_avx && impl=AVX - use cpu_flags_x86_xop && impl=XOP +blake2_impl() { + local code=' +#if defined(__XOP__) + HAVE_XOP +#elif defined(__AVX__) + HAVE_AVX +#elif defined(__SSSE3__) + HAVE_SSSE3 +#elif defined(__SSE2__) + HAVE_SSE2 +#endif +' + local res=$($(tc-getCC) -E -P ${CFLAGS} - <<<"${code}") + + case ${res} in + *HAVE_XOP*) echo XOP;; + # this does not actually do anything but implicitly enabled SSE4.1... + *HAVE_AVX*) echo AVX;; + *HAVE_SSSE3*) echo SSSE3;; + # note: SSE2 is 2.5x slower than pure REGS, so we ignore it + #*HAVE_SSE2*) echo SSE2;; + *) echo REGS;; + esac +} +python_prepare_all() { # uncomment the implementation of choice - sed -i -e "/BLAKE2_COMPRESS_${impl}/s:^#::" setup.py || die + sed -i -e "/BLAKE2_COMPRESS_$(blake2_impl)/s:^#::" setup.py || die # avoid segfault due to over(?) optimisation if [[ ${CHOST} == *86*-darwin* ]] ; then