From aa7f8e5bd7efbba10385ac768a817f0675daded1 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 17 Jul 2022 17:39:40 +0200 Subject: qt5-build.eclass: Support sed regardless if $MAKE is quoted or not Bug: https://bugs.gentoo.org/792804 Signed-off-by: Andreas Sturmlechner --- 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\).*/:/' \ -- cgit v1.2.3-65-gdbad