Skip to content

Commit

Permalink
qt5-build.eclass: use safer '|' sed delimiter, not ':'
Browse files Browse the repository at this point in the history
CC: [email protected]
Closes: https://bugs.gentoo.org/685170
Signed-off-by: Sergei Trofimovich <[email protected]>
  • Loading branch information
Sergei Trofimovich committed Jun 1, 2019
1 parent 048b8a4 commit 21eb6a8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions eclass/qt5-build.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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 //' \
Expand Down

0 comments on commit 21eb6a8

Please sign in to comment.