diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-07-17 17:39:40 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-07-23 13:23:35 +0200 |
| commit | aa7f8e5bd7efbba10385ac768a817f0675daded1 (patch) | |
| tree | 1bc76b74bc521e6b8f112c62bb7eca4ed91272df | |
| parent | qt5-build.eclass: Merge _QT5_GENTOOPATCHSET_REV handling into main block (diff) | |
| download | qt-aa7f8e5bd7efbba10385ac768a817f0675daded1.tar.gz qt-aa7f8e5bd7efbba10385ac768a817f0675daded1.tar.bz2 qt-aa7f8e5bd7efbba10385ac768a817f0675daded1.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>
| -rw-r--r-- | eclass/qt5-build.eclass | 2 |
1 files changed, 1 insertions, 1 deletions
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\).*/:/' \ |