[patch] 0001-qt5-build.eclass-use-safer-sed-delimiter-not.patch

0001-qt5-build.eclass-use-safer-sed-delimiter-not.patch (text/plain), 1.33 KB, created by Sergei Trofimovich (RETIRED) on 2019-05-26 07:43:11 UTC

From 984f4f69cadc6decf78bc9bc69d1e934e5f49d05 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <[e-mail]>
Date: Sun, 26 May 2019 08:41:12 +0100
Subject: [PATCH] qt5-build.eclass: use safer '|' sed delimiter, not ':'

Closes: https://bugs.gentoo.org/685170
Signed-off-by: Sergei Trofimovich <[e-mail]>
---
 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 613af912b93..d4f4678eed0 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -166,9 +166,9 @@ qt5-build_src_prepare() {
 			-e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)"
 
 		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
-		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
+		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s|)| \
 			${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
-			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
+			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \
 			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
 			configure || die "sed failed (respect env for qmake build)"
 		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
-- 
2.21.0