[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Haubenwallner]

commit:     c2ce1cf7b9265d985d533c162edc2365a5e431ab
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 17:26:33 2020 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 07:49:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ce1cf7

toolchain.eclass: fix cygwinports patching

Introduction of tc_apply_patches dropped patch dir, per
commit bd758f25a82460f6e7011314f9fb7923864e9e1e

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 eclass/toolchain.eclass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 9f435921922..7135af0817d 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -646,7 +646,13 @@ do_gcc_CYGWINPORTS_patches() {
 
        local p d="${WORKDIR}/gcc-${CYGWINPORTS_GITREV}"
        # readarray -t is available since bash-4.4 only, #690686
-       local patches=( $(sed -e '1,/PATCH_URI="/d;/"/,$d' < 
"${d}"/gcc.cygport) )
+       local patches=( $(
+               for p in $(
+                       sed -e '1,/PATCH_URI="/d;/"/,$d' < "${d}"/gcc.cygport
+               ); do
+                       echo "${d}/${p}"
+               done
+       ) )
        tc_apply_patches "Applying cygwin port patches ..." ${patches[*]}
 }