| 1 |
commit: 21eb6a8e43e6bf1d75dcf728afdbcfbf9fe422a1 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 26 07:41:12 2019 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 1 17:32:49 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21eb6a8e |
| 7 |
|
| 8 |
qt5-build.eclass: use safer '|' sed delimiter, not ':' |
| 9 |
|
| 10 |
CC: qt <AT> gentoo.org |
| 11 |
Closes: https://bugs.gentoo.org/685170 |
| 12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/qt5-build.eclass | 4 ++-- |
| 15 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 18 |
index 613af912b93..d4f4678eed0 100644 |
| 19 |
--- a/eclass/qt5-build.eclass |
| 20 |
+++ b/eclass/qt5-build.eclass |
| 21 |
@@ -166,9 +166,9 @@ qt5-build_src_prepare() { |
| 22 |
-e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)" |
| 23 |
|
| 24 |
# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake |
| 25 |
- sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \ |
| 26 |
+ sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s|)| \ |
| 27 |
${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \ |
| 28 |
- 'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \ |
| 29 |
+ 'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \ |
| 30 |
-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \ |
| 31 |
configure || die "sed failed (respect env for qmake build)" |
| 32 |
sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ |
Archives