Gentoo Archives: gentoo-dev

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-dev@l.g.o
Cc: Sergei Trofimovich <slyfox@g.o>, qt@g.o
Subject: [gentoo-dev] [PATCH] qt5-build.eclass: use safer '|' sed delimiter, not ':'
Date: Sun, 26 May 2019 07:45:09
Message-Id: 20190526074449.10507-1-slyfox@gentoo.org
1 CC: qt@g.o
2 Closes: https://bugs.gentoo.org/685170
3 Signed-off-by: Sergei Trofimovich <slyfox@g.o>
4 ---
5 eclass/qt5-build.eclass | 4 ++--
6 1 file changed, 2 insertions(+), 2 deletions(-)
7
8 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
9 index 613af912b93..d4f4678eed0 100644
10 --- a/eclass/qt5-build.eclass
11 +++ b/eclass/qt5-build.eclass
12 @@ -166,9 +166,9 @@ qt5-build_src_prepare() {
13 -e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)"
14
15 # Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
16 - sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
17 + sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s|)| \
18 ${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
19 - 'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
20 + 'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \
21 -e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
22 configure || die "sed failed (respect env for qmake build)"
23 sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
24 --
25 2.21.0