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 9432A138359 for ; Tue, 10 Nov 2020 22:22:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B7B1E0815; Tue, 10 Nov 2020 22:22:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 AFB00E0815 for ; Tue, 10 Nov 2020 22:22:30 +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 6170E335DAE for ; Tue, 10 Nov 2020 22:22:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA8EE443 for ; Tue, 10 Nov 2020 22:22:27 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1605046942.56470165472b6d99db739c36b1ceef77b080706c.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libffi/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libffi/libffi-3.3-r2.ebuild X-VCS-Directories: dev-libs/libffi/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 56470165472b6d99db739c36b1ceef77b080706c X-VCS-Branch: master Date: Tue, 10 Nov 2020 22:22:27 +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: b717e08e-d9f1-4a8a-9168-8cf6997280f9 X-Archives-Hash: e2b9dcf2d3c11b66b2255962a503458a commit: 56470165472b6d99db739c36b1ceef77b080706c Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Nov 10 22:21:59 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Nov 10 22:22:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56470165 dev-libs/libffi: drop no-op pkg_setup() Due to a bug in handling empty ${ROOT} pkg_setup() was a no-op. It's not a big problem as it used to check for libffi presence outside package manager (usually due to old gcc bundlibg libffi). The check should should be redundant on modern toolchain. Reported-by: Pacho Ramos Closes: https://bugs.gentoo.org/753821 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/libffi/libffi-3.3-r2.ebuild | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild index 19e01b0832d..0b379dac2a4 100644 --- a/dev-libs/libffi/libffi-3.3-r2.ebuild +++ b/dev-libs/libffi/libffi-3.3-r2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit multilib multilib-minimal toolchain-funcs +inherit multilib multilib-minimal MY_PV=${PV/_rc/-rc} MY_P=${PN}-${MY_PV} @@ -38,20 +38,6 @@ S=${WORKDIR}/${MY_P} ECONF_SOURCE=${S} -pkg_setup() { - # Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example - if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then - local base="${T}"/conftest - echo 'int main() { }' > "${base}".c - $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null - if [ $? -eq 0 ]; then - eerror "The linker reported linking against -lffi to be working while it shouldn't have." - eerror "This is wrong and you should find and delete the old copy of libffi before continuing." - die "The system is in inconsistent state with unknown libffi installed." - fi - fi -} - multilib_src_configure() { use userland_BSD && export HOST="${CHOST}" # --includedir= path maintains a few properties: