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 6BA0E1388C2 for ; Sun, 6 Dec 2015 17:56:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37CA021C0A8; Sun, 6 Dec 2015 17:56:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8A41D21C069 for ; Sun, 6 Dec 2015 17:56:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53180340766 for ; Sun, 6 Dec 2015 17:56:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FF42C91 for ; Sun, 6 Dec 2015 17:56:02 +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: <1449424453.2047635e250abdcf47c24c3acf12a1d27297dd9e.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/multilib-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2047635e250abdcf47c24c3acf12a1d27297dd9e X-VCS-Branch: multilib-eapi6 Date: Sun, 6 Dec 2015 17:56:02 +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-Archives-Salt: b7969342-4823-47ce-a271-9d07cd7db317 X-Archives-Hash: a3dac0329d0c11d177490072f82e11da commit: 2047635e250abdcf47c24c3acf12a1d27297dd9e Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:12:45 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:54:13 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2047635e multilib-build.eclass: Mark eclass-generated variables read-only eclass/multilib-build.eclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index ca0fd54..dd03553 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -37,7 +37,7 @@ inherit multibuild multilib # Please contact multilib before modifying this list. This way we can # ensure that every *preliminary* work is done and the multilib can be # extended safely. -_MULTILIB_FLAGS=( +declare -g -r _MULTILIB_FLAGS=( abi_x86_32:x86,x86_fbsd,x86_freebsd,x86_linux,x86_macos,x86_solaris abi_x86_64:amd64,amd64_fbsd,x64_freebsd,amd64_linux,x64_macos,x64_solaris abi_x86_x32:x32 @@ -123,7 +123,7 @@ _multilib_build_set_globals() { local usedeps=${flags[@]/%/(-)?} IUSE=${flags[*]} - MULTILIB_USEDEP=${usedeps// /,} + declare -g -r MULTILIB_USEDEP=${usedeps// /,} } _multilib_build_set_globals @@ -196,9 +196,10 @@ _multilib_multibuild_wrapper() { debug-print-function ${FUNCNAME} "${@}" local ABI=${MULTIBUILD_VARIANT#*.} - local MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%.*} + local -r MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%.*} multilib_toolchain_setup "${ABI}" + readonly ABI "${@}" }