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 8122A1382C5 for ; Mon, 7 Dec 2020 00:33:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 059B3E0AB0; Mon, 7 Dec 2020 00:33:42 +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 E068AE0AB0 for ; Mon, 7 Dec 2020 00:33:41 +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 DFE41340E62 for ; Mon, 7 Dec 2020 00:33:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E2B3447 for ; Mon, 7 Dec 2020 00:33:39 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1607301217.41978046162dd69628a5d7b715b486bbac5ff66a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/cffi/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/cffi/cffi-1.14.4.ebuild X-VCS-Directories: dev-python/cffi/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 41978046162dd69628a5d7b715b486bbac5ff66a X-VCS-Branch: master Date: Mon, 7 Dec 2020 00:33: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 413f4033-3d03-4e46-a1c9-91da72fb595b X-Archives-Hash: 5e80d2501ddb0d7bb4591e1ade5fd2a1 commit: 41978046162dd69628a5d7b715b486bbac5ff66a Author: Sam James gentoo org> AuthorDate: Mon Dec 7 00:33:28 2020 +0000 Commit: Sam James gentoo org> CommitDate: Mon Dec 7 00:33:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41978046 dev-python/cffi: fix 1.14.4 build on Darwin Upstream added a further unconditional sysroot include on Darwin, even if pkgconfig worked. Let's drop that. Package-Manager: Portage-3.0.10.3-prefix, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> dev-python/cffi/cffi-1.14.4.ebuild | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dev-python/cffi/cffi-1.14.4.ebuild b/dev-python/cffi/cffi-1.14.4.ebuild index b3bdb3d093d..424351b6817 100644 --- a/dev-python/cffi/cffi-1.14.4.ebuild +++ b/dev-python/cffi/cffi-1.14.4.ebuild @@ -33,6 +33,14 @@ PATCHES=( "${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch ) +src_prepare() { + if [[ ${CHOST} == *darwin* ]] ; then + # Don't obsessively try to find libffi + sed -i -e "s/.*\-iwithsysroot\/usr\/include\/ffi.*/\tpass/" setup.py || die + fi + distutils-r1_src_prepare +} + src_configure() { tc-export PKG_CONFIG }