Gentoo Archives: gentoo-dev

From: haubi@g.o
To: gentoo-dev@l.g.o
Cc: Michael Haubenwallner <haubi@g.o>
Subject: [gentoo-dev] [PATCH] toolchain.eclass: fix cygwinports patching
Date: Mon, 16 Mar 2020 17:41:20
Message-Id: 20200316174102.8526-1-haubi@gentoo.org
From: Michael Haubenwallner <haubi@g.o>

Introduction of tc_apply_patches dropped patch dir, per
commit bd758f25a82460f6e7011314f9fb7923864e9e1e

Signed-off-by: Michael Haubenwallner <haubi@g.o>
---
 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[*]}
 }
 
-- 
2.24.1

Replies

Subject Author
Re: [gentoo-dev] [PATCH] toolchain.eclass: fix cygwinports patching Sergei Trofimovich <slyfox@g.o>