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 E7788138334 for ; Sun, 1 Dec 2019 20:20:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39746E085D; Sun, 1 Dec 2019 20:20:27 +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 1FA2DE0869 for ; Sun, 1 Dec 2019 20:20:27 +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 24B4334D672 for ; Sun, 1 Dec 2019 20:20:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 228A48C6 for ; Sun, 1 Dec 2019 20:20:04 +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: <1575231574.f9b70d39ab2c06e476f3e8dc09d1d8f16e74e099.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/distutils-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f9b70d39ab2c06e476f3e8dc09d1d8f16e74e099 X-VCS-Branch: master Date: Sun, 1 Dec 2019 20:20:04 +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: 99e332a2-e853-4fc9-bc2a-63ec5bc811e0 X-Archives-Hash: 1c48da29905045c574dd7f0fde6d33a6 commit: f9b70d39ab2c06e476f3e8dc09d1d8f16e74e099 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 1 16:12:55 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Dec 1 20:19:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b70d39 distutils-r1.eclass: Handle missing BUILD_DIR for any-r1 API When any-r1 API is used for *_all sub-phases, an implementation that was not selected by the user may be used. In this case, DISTUTILS_IN_SOURCE_BUILD will not create the BUILD_DIR for this implementation; however, the phase runner will still try to enter it and fail. Handle this gracefully by falling back to ${S}. Closes: https://bugs.gentoo.org/701506 Signed-off-by: Michał Górny gentoo.org> eclass/distutils-r1.eclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index f44f0aee9c2..0c5d6781f83 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -821,7 +821,11 @@ distutils-r1_run_phase() { debug-print-function ${FUNCNAME} "${@}" if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then - if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + # only force BUILD_DIR if implementation is explicitly enabled + # for building; any-r1 API may select one that is not + # https://bugs.gentoo.org/701506 + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]] && + has "${EPYTHON/./_}" ${PYTHON_TARGETS}; then cd "${BUILD_DIR}" || die fi local BUILD_DIR=${BUILD_DIR}/build