qt5-build.eclass: use safer '|' sed delimiter, not ':'
authorSergei Trofimovich <slyfox@gentoo.org>
Sun, 26 May 2019 07:41:12 +0000 (08:41 +0100)
committerSergei Trofimovich <slyfox@gentoo.org>
Sat, 1 Jun 2019 17:32:49 +0000 (18:32 +0100)
CC: qt@gentoo.org
Closes: https://bugs.gentoo.org/685170
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
eclass/qt5-build.eclass

index 613af912b93a87f24b8301a2901caa8dca188496..d4f4678eed07ba5fbe826d4af36b3867a79ea6b0 100644 (file)
@@ -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 //' \