commit: aa7f8e5bd7efbba10385ac768a817f0675daded1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 17 15:39:40 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jul 23 11:23:35 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=aa7f8e5b
qt5-build.eclass: Support sed regardless if $MAKE is quoted or not Bug: https://bugs.gentoo.org/792804 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/qt5-build.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 872357ec..c6cb5dd3 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -186,7 +186,7 @@ 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}'&|" \ -e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
