[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 370c5107c3226084a0001113cffc68a88160aa99 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:27:56 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:17:15 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=370c5107 multilib-minimal.eclass: Enable EAPI 6 eclass/multilib-minimal.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index ca5e9ce..c6f39e2 100644 --- a/eclass/multilib-minimal.eclass +++ b/eclass/multilib-minimal.eclass @@ -25,7 +25,7 @@ # EAPI=4 is required for meaningful MULTILIB_USEDEP. case ${EAPI:-0} in - 4|5) ;; + [456]) ;; *) die "EAPI=${EAPI} is not supported" ;; esac
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 2f4fc0e9be4803dbd36c906f8bccd5293364ac9d Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:25:00 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:16:36 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f4fc0e9 multilib-build.eclass: Enable EAPI 6 eclass/multilib-build.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 3edc5e9..eab8061 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -21,7 +21,7 @@ if [[ ! ${_MULTILIB_BUILD} ]]; then # EAPI=4 is required for meaningful MULTILIB_USEDEP. case ${EAPI:-0} in - 4|5) ;; + [456]) ;; *) die "EAPI=${EAPI} is not supported" ;; esac
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: b8952f6107acd449f152b639d8b6d6f0a4538302 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:33:55 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:15:09 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8952f61 multilib-build.eclass: Unset local functions after use eclass/multilib-build.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 09d4d72..9832d81 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -272,6 +272,7 @@ multilib_check_headers() { local cksum cksum_prev local cksum_file=${T}/.multilib_header_cksum cksum=$(_multilib_header_cksum) || die + unset -f _multilib_header_cksum if [[ -f ${cksum_file} ]]; then cksum_prev=$(< "${cksum_file}") || die
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 7352c0e7a5777971f350e82516aeac4bc603ff5d Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:27:06 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:16:46 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7352c0e7 multilib-minimal.eclass: Remove eutils in EAPI 6 (einstalldocs built-in) eclass/multilib-minimal.eclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index a3b6d37..ca5e9ce 100644 --- a/eclass/multilib-minimal.eclass +++ b/eclass/multilib-minimal.eclass @@ -30,7 +30,8 @@ case ${EAPI:-0} in esac -inherit eutils multilib-build +[[ ${EAPI} == [45] ]] && inherit eutils +inherit multilib-build EXPORT_FUNCTIONS src_configure src_compile src_test src_install
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 6e4e58c11f147ffa624de821502671e1e65cc210 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:41:02 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 15:41:02 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4e58c1 multilib-build.eclass: Unset global-setting function after use eclass/multilib-build.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 409874c..726c655 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -127,6 +127,7 @@ _multilib_build_set_globals() { declare -g -r MULTILIB_USEDEP=${usedeps// /,} } _multilib_build_set_globals +unset -f _multilib_build_set_globals # @FUNCTION: multilib_get_enabled_abis # @DESCRIPTION:
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: bc4478884e56e6cc3f595023352b324a363ccd8e Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:33:55 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 15:33:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc447888 multilib-build.eclass: unset local functions eclass/multilib-build.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 1cb371c..409874c 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -275,6 +275,7 @@ multilib_check_headers() { local cksum cksum_prev local cksum_file=${T}/.multilib_header_cksum cksum=$(_multilib_header_cksum) || die + unset -f _multilib_header_cksum if [[ -f ${cksum_file} ]]; then cksum_prev=$(< "${cksum_file}") || die
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 1dff18d0d5c77ac1430d85f6ed75bf305f2d0fdd Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:27:06 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:55:01 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dff18d0 multilib-minimal.eclass: Remove eutils in EAPI 6 (einstalldocs built-in) eclass/multilib-minimal.eclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index a3b6d37..ca5e9ce 100644 --- a/eclass/multilib-minimal.eclass +++ b/eclass/multilib-minimal.eclass @@ -30,7 +30,8 @@ case ${EAPI:-0} in esac -inherit eutils multilib-build +[[ ${EAPI} == [45] ]] && inherit eutils +inherit multilib-build EXPORT_FUNCTIONS src_configure src_compile src_test src_install
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: b1d0814a5ee3d353a80b47f47f20bdf0db44c75e Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:22:48 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:54:43 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d0814a multilib-build.eclass: Ban deprecated functions in EAPI 6 eclass/multilib-build.eclass | 4 1 file changed, 4 insertions(+) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 8a3ac7f..49bebf3 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -246,6 +246,8 @@ multilib_parallel_foreach_abi() { multilib_for_best_abi() { debug-print-function ${FUNCNAME} "${@}" + [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" + eqawarn "QA warning: multilib_for_best_abi() function is deprecated and should" eqawarn "not be used. The multilib_is_native_abi() check may be used instead." @@ -580,6 +582,8 @@ multilib_is_native_abi() { multilib_build_binaries() { debug-print-function ${FUNCNAME} "${@}" + [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" + eqawarn "QA warning: multilib_build_binaries is deprecated. Please use the equivalent" eqawarn "multilib_is_native_abi function instead."
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: c7b5e304831c4f4c0d278aa3b4af6de592dfa6f9 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:23:47 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:54:49 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b5e304 multilib-build.eclass: Add missing eutils inherit for eqawarn eclass/multilib-build.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 49bebf3..eb7bf9a 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -25,6 +25,7 @@ case ${EAPI:-0} in *) die "EAPI=${EAPI} is not supported" ;; esac +[[ ${EAPI} == [45] ]] && inherit eutils inherit multibuild multilib # @ECLASS-VARIABLE: _MULTILIB_FLAGS
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 8fcec8af378325d2c5e2477e2f08c39059d12f84 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:21:00 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:54:25 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fcec8af multilib-build.eclass: Add missing error checks eclass/multilib-build.eclass | 26 +++--- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index dd03553..8e58a2b 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -262,19 +262,23 @@ multilib_for_best_abi() { # runs (if any). Dies if header files differ. multilib_check_headers() { _multilib_header_cksum() { - [[ -d ${ED}usr/include ]] && \ - find "${ED}"usr/include -type f \ - -exec cksum {} + | sort -k2 + set -o pipefail + + if [[ -d ${ED}usr/include ]]; then + find "${ED}"usr/include -type f \ + -exec cksum {} + | sort -k2 + fi } - local cksum=$(_multilib_header_cksum) + local cksum cksum_prev local cksum_file=${T}/.multilib_header_cksum + cksum=$(_multilib_header_cksum) || die if [[ -f ${cksum_file} ]]; then - local cksum_prev=$(< "${cksum_file}") + cksum_prev=$(< "${cksum_file}") || die if [[ ${cksum} != ${cksum_prev} ]]; then - echo "${cksum}" > "${cksum_file}.new" + echo "${cksum}" > "${cksum_file}.new" || die eerror "Header files have changed between ABIs." @@ -288,7 +292,7 @@ multilib_check_headers() { die "Header checksum mismatch, aborting." fi else - echo "${cksum}" > "${cksum_file}" + echo "${cksum}" > "${cksum_file}" || die fi } @@ -409,9 +413,9 @@ multilib_prepare_wrappers() { if [[ -L ${root}/${f} ]]; then # rewrite the symlink target - local target=$(readlink "${root}/${f}") - local target_dir - local target_fn=${target##*/} + local target + target=$(readlink "${root}/${f}") || die + local target_dir target_fn=${target##*/} [[ ${target} == */* ]] && target_dir=${target%/*} @@ -453,7 +457,7 @@ multilib_prepare_wrappers() { if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then dodir "/tmp/multilib-include${dir}" # a generic template - cat > "${wrapper}" <<_EOF_ + cat > "${wrapper}" <<_EOF_ || die /* This file is auto-generated by multilib-build.eclass * as a multilib-friendly wrapper. For the original content, * please see the files that are #included below.
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 2047635e250abdcf47c24c3acf12a1d27297dd9e Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:12:45 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:54:13 2015 + 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 "${@}" }
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 85978ffaa45c38a46ffdd3390f29a6123a4580e6 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:33:55 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:54:31 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85978ffa multilib-build.eclass: Unset local functions after use eclass/multilib-build.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 8e58a2b..664cd43 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -273,6 +273,7 @@ multilib_check_headers() { local cksum cksum_prev local cksum_file=${T}/.multilib_header_cksum cksum=$(_multilib_header_cksum) || die + unset -f _multilib_header_cksum if [[ -f ${cksum_file} ]]; then cksum_prev=$(< "${cksum_file}") || die
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 3bed5d32c6536e98c995d1da1e07cf28203dc958 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:41:02 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:54:37 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bed5d32 multilib-build.eclass: Unset global-setting function after use eclass/multilib-build.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 664cd43..8a3ac7f 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -126,6 +126,7 @@ _multilib_build_set_globals() { declare -g -r MULTILIB_USEDEP=${usedeps// /,} } _multilib_build_set_globals +unset -f _multilib_build_set_globals # @FUNCTION: multilib_get_enabled_abis # @DESCRIPTION:
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 61d0e80e92031e1cc67c3aa5c7477533872097ae Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:27:56 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:55:06 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d0e80e multilib-minimal.eclass: Enable EAPI 6 eclass/multilib-minimal.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index ca5e9ce..c6f39e2 100644 --- a/eclass/multilib-minimal.eclass +++ b/eclass/multilib-minimal.eclass @@ -25,7 +25,7 @@ # EAPI=4 is required for meaningful MULTILIB_USEDEP. case ${EAPI:-0} in - 4|5) ;; + [456]) ;; *) die "EAPI=${EAPI} is not supported" ;; esac
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: b006613644770f9cd341eeebf497284537731380 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:25:00 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:54:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0066136 multilib-build.eclass: Enable EAPI 6 eclass/multilib-build.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index eb7bf9a..e9e5604 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -21,7 +21,7 @@ if [[ ! ${_MULTILIB_BUILD} ]]; then # EAPI=4 is required for meaningful MULTILIB_USEDEP. case ${EAPI:-0} in - 4|5) ;; + [456]) ;; *) die "EAPI=${EAPI} is not supported" ;; esac
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 8efa55e8fa63a3f9e04d01296648d8f671896b81 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:12:45 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:14:48 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efa55e8 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 "${@}" }
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 41b8034d2ac606e2769fa067b8ec917127ccd7db Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:22:48 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:16:14 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b8034d multilib-build.eclass: Ban deprecated functions in EAPI 6 eclass/multilib-build.eclass | 4 1 file changed, 4 insertions(+) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index d84986e..c7dd98a 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -246,6 +246,8 @@ multilib_parallel_foreach_abi() { multilib_for_best_abi() { debug-print-function ${FUNCNAME} "${@}" + [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" + eqawarn "QA warning: multilib_for_best_abi() function is deprecated and should" eqawarn "not be used. The multilib_is_native_abi() check may be used instead." @@ -579,6 +581,8 @@ multilib_is_native_abi() { multilib_build_binaries() { debug-print-function ${FUNCNAME} "${@}" + [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" + eqawarn "QA warning: multilib_build_binaries is deprecated. Please use the equivalent" eqawarn "multilib_is_native_abi function instead."
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: e98a0b87dbe1a99a1a7ac2410737ed0858129ffe Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:21:00 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:15:01 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e98a0b87 multilib-build.eclass: Add missing error checks eclass/multilib-build.eclass | 19 +++ 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index dd03553..09d4d72 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -262,19 +262,22 @@ multilib_for_best_abi() { # runs (if any). Dies if header files differ. multilib_check_headers() { _multilib_header_cksum() { + set -o pipefail + [[ -d ${ED}usr/include ]] && \ find "${ED}"usr/include -type f \ -exec cksum {} + | sort -k2 } - local cksum=$(_multilib_header_cksum) + local cksum cksum_prev local cksum_file=${T}/.multilib_header_cksum + cksum=$(_multilib_header_cksum) || die if [[ -f ${cksum_file} ]]; then - local cksum_prev=$(< "${cksum_file}") + cksum_prev=$(< "${cksum_file}") || die if [[ ${cksum} != ${cksum_prev} ]]; then - echo "${cksum}" > "${cksum_file}.new" + echo "${cksum}" > "${cksum_file}.new" || die eerror "Header files have changed between ABIs." @@ -288,7 +291,7 @@ multilib_check_headers() { die "Header checksum mismatch, aborting." fi else - echo "${cksum}" > "${cksum_file}" + echo "${cksum}" > "${cksum_file}" || die fi } @@ -409,9 +412,9 @@ multilib_prepare_wrappers() { if [[ -L ${root}/${f} ]]; then # rewrite the symlink target - local target=$(readlink "${root}/${f}") - local target_dir - local target_fn=${target##*/} + local target + target=$(readlink "${root}/${f}") || die + local target_dir target_fn=${target##*/} [[ ${target} == */* ]] && target_dir=${target%/*} @@ -453,7 +456,7 @@ multilib_prepare_wrappers() { if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then dodir "/tmp/multilib-include${dir}" # a generic template - cat > "${wrapper}" <<_EOF_ + cat > "${wrapper}" <<_EOF_ || die /* This file is auto-generated by multilib-build.eclass * as a multilib-friendly wrapper. For the original content, * please see the files that are #included below.
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 9818ed81c478f312011308449fd2396e17798ea2 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:23:47 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:16:26 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9818ed81 multilib-build.eclass: Add missing eutils inherit for eqawarn eclass/multilib-build.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index c7dd98a..3edc5e9 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -25,6 +25,7 @@ case ${EAPI:-0} in *) die "EAPI=${EAPI} is not supported" ;; esac +[[ ${EAPI} == [45] ]] && inherit eutils inherit multibuild multilib # @ECLASS-VARIABLE: _MULTILIB_FLAGS
[gentoo-commits] repo/gentoo:multilib-eapi6 commit in: eclass/
commit: 7669c1e1fdffbcaf2b422e6e05dd92bf4b51a7b8 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 15:41:02 2015 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 6 17:16:05 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7669c1e1 multilib-build.eclass: Unset global-setting function after use eclass/multilib-build.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 9832d81..d84986e 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -126,6 +126,7 @@ _multilib_build_set_globals() { declare -g -r MULTILIB_USEDEP=${usedeps// /,} } _multilib_build_set_globals +unset -f _multilib_build_set_globals # @FUNCTION: multilib_get_enabled_abis # @DESCRIPTION: