Gentoo Archives: gentoo-commits

From: Michael Haubenwallner <haubi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 12 Aug 2019 06:34:55
Message-Id: 1565591662.84fc5c9d1092eeacdf29900874d83fedca5bdacc.haubi@gentoo
1 commit: 84fc5c9d1092eeacdf29900874d83fedca5bdacc
2 Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 8 10:51:08 2019 +0000
4 Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 12 06:34:22 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84fc5c9d
7
8 toolchain.eclass (do_gcc_CYGWINPORTS_patches): avoid bash-4.4ism
9
10 Closes: https://bugs.gentoo.org/690686
11 Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>
12
13 eclass/toolchain.eclass | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16 diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
17 index 6bc04b4cbfe..40d46ed0707 100644
18 --- a/eclass/toolchain.eclass
19 +++ b/eclass/toolchain.eclass
20 @@ -687,9 +687,9 @@ do_gcc_CYGWINPORTS_patches() {
21 [[ -n ${CYGWINPORTS_GITREV} ]] || return 0
22 use elibc_Cygwin || return 0
23
24 - local -a patches
25 local p d="${WORKDIR}/gcc-${CYGWINPORTS_GITREV}"
26 - readarray -t patches < <(sed -e '1,/PATCH_URI="/d;/"/,$d' < "${d}"/gcc.cygport)
27 + # readarray -t is available since bash-4.4 only, #690686
28 + local patches=( $(sed -e '1,/PATCH_URI="/d;/"/,$d' < "${d}"/gcc.cygport) )
29 for p in ${patches[*]}; do
30 epatch "${d}/${p}"
31 done