commit:     f3cec249275ed4e00f1a9b465f44012a90dc6aff
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 17:20:03 2020 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 17:23:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f3cec249

toolchain.eclass: fix applying cygwinports patches

This commit in gentoo repo broke it (after sync into overlay):

commit bd758f25a82460f6e7011314f9fb7923864e9e1e
Author: Sergei Trofimovich <slyfox <AT> gentoo.org>
Date:   Sat Oct 19 13:54:48 2019 +0100

    toolchain.eclass: isolate 'epatch' into 'tc_apply_patches'

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

 eclass/toolchain.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 89a522f9cf..57c4177d70 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -666,7 +666,9 @@ 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[*]}
 }
 

Reply via email to