Gentoo Archives: gentoo-dev

From: Sergei Trofimovich <slyfox@g.o>
To: haubi@g.o
Cc: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] [PATCH] toolchain.eclass: fix cygwinports patching
Date: Mon, 16 Mar 2020 18:50:31
Message-Id: 20200316185009.4dcedfb7@sf
In Reply to: [gentoo-dev] [PATCH] toolchain.eclass: fix cygwinports patching by haubi@gentoo.org
1 On Mon, 16 Mar 2020 18:41:02 +0100
2 haubi@g.o wrote:
3
4 > From: Michael Haubenwallner <haubi@g.o>
5 >
6 > Introduction of tc_apply_patches dropped patch dir, per
7 > commit bd758f25a82460f6e7011314f9fb7923864e9e1e
8 >
9 > Signed-off-by: Michael Haubenwallner <haubi@g.o>
10 > ---
11 > eclass/toolchain.eclass | 8 +++++++-
12 > 1 file changed, 7 insertions(+), 1 deletion(-)
13 >
14 > diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
15 > index 9f435921922..7135af0817d 100644
16 > --- a/eclass/toolchain.eclass
17 > +++ b/eclass/toolchain.eclass
18 > @@ -646,7 +646,13 @@ do_gcc_CYGWINPORTS_patches() {
19 >
20 > local p d="${WORKDIR}/gcc-${CYGWINPORTS_GITREV}"
21 > # readarray -t is available since bash-4.4 only, #690686
22 > - local patches=( $(sed -e '1,/PATCH_URI="/d;/"/,$d' < "${d}"/gcc.cygport) )
23 > + local patches=( $(
24 > + for p in $(
25 > + sed -e '1,/PATCH_URI="/d;/"/,$d' < "${d}"/gcc.cygport
26 > + ); do
27 > + echo "${d}/${p}"
28 > + done
29 > + ) )
30 > tc_apply_patches "Applying cygwin port patches ..." ${patches[*]}
31 > }
32
33 Looks good. Please push it.
34
35
36 --
37
38 Sergei