summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-07-17 17:39:40 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-07-23 13:21:01 +0200
commit3834431f616e7cd362315b23ea47e2aade67a264 (patch)
treeb2e19865404c58ee6a51906ceda07986fe8140c5 /eclass/qt5-build.eclass
parentdev-qt/qtcore: fix musl with libexecinfo (diff)
downloadgentoo-3834431f616e7cd362315b23ea47e2aade67a264.tar.gz
gentoo-3834431f616e7cd362315b23ea47e2aade67a264.tar.bz2
gentoo-3834431f616e7cd362315b23ea47e2aade67a264.zip
qt5-build.eclass: Support sed regardless if $MAKE is quoted or not
Bug: https://bugs.gentoo.org/792804 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass/qt5-build.eclass')
-rw-r--r--eclass/qt5-build.eclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 872357ec3896..c6cb5dd3682e 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\).*/:/' \