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 2A4AC1382C5 for ; Sun, 17 May 2020 07:55:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 504C2E0885; Sun, 17 May 2020 07:55:52 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 28889E0885 for ; Sun, 17 May 2020 07:55:52 +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 C275634F6CD for ; Sun, 17 May 2020 07:55:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75F639C for ; Sun, 17 May 2020 07:55:49 +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: <1589702017.c5f442f59afc84a329aa908047c3072ed28886e6.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/zstandard/files/, dev-python/zstandard/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/zstandard/files/zstandard-0.13.0-compiler.patch dev-python/zstandard/zstandard-0.13.0.ebuild X-VCS-Directories: dev-python/zstandard/files/ dev-python/zstandard/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c5f442f59afc84a329aa908047c3072ed28886e6 X-VCS-Branch: master Date: Sun, 17 May 2020 07:55:49 +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: 79af00f9-f77d-4785-be43-4497c204e4fb X-Archives-Hash: e2fc1859e76d30ad747d2963d15d7c66 commit: c5f442f59afc84a329aa908047c3072ed28886e6 Author: Michał Górny gentoo org> AuthorDate: Sun May 17 07:53:37 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun May 17 07:53:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5f442f5 dev-python/zstandard: Fix compiler init, modernize Closes: https://bugs.gentoo.org/720784 Signed-off-by: Michał Górny gentoo.org> .../files/zstandard-0.13.0-compiler.patch | 26 ++++++++++++++++++++++ dev-python/zstandard/zstandard-0.13.0.ebuild | 16 ++++++------- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch b/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch new file mode 100644 index 00000000000..fdaa4aa0392 --- /dev/null +++ b/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch @@ -0,0 +1,26 @@ +diff --git a/make_cffi.py b/make_cffi.py +index 0db4f71..4fe9cc4 100644 +--- a/make_cffi.py ++++ b/make_cffi.py +@@ -8,6 +8,7 @@ from __future__ import absolute_import + + import cffi + import distutils.ccompiler ++import distutils.sysconfig + import os + import re + import subprocess +@@ -75,10 +76,12 @@ compiler = distutils.ccompiler.new_compiler() + if hasattr(compiler, "initialize"): + compiler.initialize() + ++distutils.sysconfig.customize_compiler(compiler) ++ + # Distutils doesn't set compiler.preprocessor, so invoke the preprocessor + # manually. + if compiler.compiler_type == "unix": +- args = list(compiler.executables["compiler"]) ++ args = compiler.compiler + args.extend( + ["-E", "-DZSTD_STATIC_LINKING_ONLY", "-DZDICT_STATIC_LINKING_ONLY",] + ) diff --git a/dev-python/zstandard/zstandard-0.13.0.ebuild b/dev-python/zstandard/zstandard-0.13.0.ebuild index 2b6a5215994..59d51ed70dc 100644 --- a/dev-python/zstandard/zstandard-0.13.0.ebuild +++ b/dev-python/zstandard/zstandard-0.13.0.ebuild @@ -14,19 +14,19 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="BSD" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] +BDEPEND=" test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )" +distutils_enable_tests setup.py + +PATCHES=( + # https://github.com/indygreg/python-zstandard/issues/103 + "${FILESDIR}"/zstandard-0.13.0-compiler.patch +) + python_compile() { local MAKEOPTS=-j1 distutils-r1_python_compile } - -python_test() { - esetup.py test -}