diff options
| author |   Jimi Huotari <chiitoo@gentoo.org> | 2019-06-08 22:26:46 +0300 |
|---|---|---|
| committer | Jimi Huotari <chiitoo@gentoo.org> | 2019-06-08 22:34:23 +0300 |
| commit | bd1dfde90f4b128ca3faa7c5a9295b244bf96d0f (patch) | |
| tree | ee2b4c2d67e879e928b99cddfe74816845d3fe97 /eclass | |
| parent | qt5-build.eclass: Drop obsolete <Qt-5.12 conditionals (diff) | |
| download | qt-bd1dfde90f4b128ca3faa7c5a9295b244bf96d0f.tar.gz qt-bd1dfde90f4b128ca3faa7c5a9295b244bf96d0f.tar.bz2 qt-bd1dfde90f4b128ca3faa7c5a9295b244bf96d0f.zip | |
qt5-build.eclass: sync with the main Gentoo ebuild repo tree
Use '|' sed delimiter instead of ':', which leads to a failure in
'src_prepare()' with 'CXXFLAGS=-falign-functions=32:25:1'.
- https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21eb6a8e
Bug: https://bugs.gentoo.org/685170
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 434cb63c..0e169834 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -166,9 +166,9 @@ 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}'&:" \ + 'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \ -e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \ configure || die "sed failed (respect env for qmake build)" sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ |