From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E6F86198005 for ; Wed, 6 Mar 2013 14:26:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 748E8E0C0D; Wed, 6 Mar 2013 14:25:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A33F4E0C06 for ; Wed, 6 Mar 2013 14:25:45 +0000 (UTC) Received: from pomiocik.lan (77-255-31-156.adsl.inetia.pl [77.255.31.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id CE9EF33DC8F; Wed, 6 Mar 2013 14:25:38 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: python@gentoo.org, =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 2/3] python-r1: use multibuild_copy_sources. Date: Wed, 6 Mar 2013 15:25:54 +0100 Message-Id: <1362579955-31813-2-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1362579955-31813-1-git-send-email-mgorny@gentoo.org> References: <1362579955-31813-1-git-send-email-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: ebb25707-76f8-4404-b201-cf5a061093bf X-Archives-Hash: 348763ff5281071289f34b38c48e1b88 --- gx86/eclass/python-r1.eclass | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/gx86/eclass/python-r1.eclass b/gx86/eclass/python-r1.eclass index 934f32d..36b20dc 100644 --- a/gx86/eclass/python-r1.eclass +++ b/gx86/eclass/python-r1.eclass @@ -348,34 +348,22 @@ python_gen_cond_dep() { # @FUNCTION: python_copy_sources # @DESCRIPTION: -# Create a single copy of the package sources (${S}) for each enabled -# Python implementation. +# Create a single copy of the package sources for each enabled Python +# implementation. # -# The sources are always copied from S to implementation-specific build -# directories respecting BUILD_DIR. +# The sources are always copied from initial BUILD_DIR (or S if unset) +# to implementation-specific build directory matching BUILD_DIR used by +# python_foreach_abi(). python_copy_sources() { debug-print-function ${FUNCNAME} "${@}" _python_validate_useflags + _python_check_USE_PYTHON - local impl - local bdir=${BUILD_DIR:-${S}} - - debug-print "${FUNCNAME}: bdir = ${bdir}" - einfo "Will copy sources from ${S}" - # the order is irrelevant here - for impl in "${PYTHON_COMPAT[@]}"; do - _python_impl_supported "${impl}" || continue - - if use "python_targets_${impl}" - then - local BUILD_DIR=${bdir%%/}-${impl} + local MULTIBUILD_VARIANTS + _python_obtain_impls - einfo "${impl}: copying to ${BUILD_DIR}" - debug-print "${FUNCNAME}: [${impl}] cp ${S} => ${BUILD_DIR}" - cp -pr "${S}" "${BUILD_DIR}" || die - fi - done + multibuild_copy_sources } # @FUNCTION: _python_check_USE_PYTHON -- 1.8.1.5