Skip to content

Commit

Permalink
qt5-build.eclass: adapt to changes in Qt 5.9 git
Browse files Browse the repository at this point in the history
A recent commit upstream [1] renamed some configure tests which resulted
in a broken build. It seems that these sed invocations were effectively
a no-op since at least [2] which apparently removed the last instance of
qmake's `-nocache` argument.

This seding was in place in the qt5-build.eclass since its very
beginning. I believe that the explanatory comment does not effectively
match what the code (might have been trying to) do. It seems that the
real origin dates back to 2015 when it was added [3] to the
qt4-build-multilib.eclass by @Pesa.

Given that this `sed` was not doing anything for the past year anyway
and that nobody reported a bug about that AFAIK and that it started
breaking the build, it is safe to remove it now.

[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=b0060d1056d6d1752d91652261de97db909c7862
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=d90db0f136d727f8e6b9a566eee3eae80cd7d81e
[3] gentoo/gentoo-gitmig-20150809-draft@265a3c9
  • Loading branch information
jktjkt authored and Michael Palimaka committed Oct 8, 2017
1 parent 28bf305 commit 7ff0317
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions eclass/qt5-build.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,11 @@ qt5-build_src_prepare() {
sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
configure || die "sed failed (QMAKE_CONF_COMPILER)"

# Respect toolchain and flags in config.tests
find config.tests/unix -name '*.test' -type f -execdir \
sed -i -e 's/-nocache //' '{}' + || die
if [[ ${QT5_MINOR_VERSION} -le 7 ]]; then
# Respect toolchain and flags in config.tests
find config.tests/unix -name '*.test' -type f -execdir \
sed -i -e 's/-nocache //' '{}' + || die
fi

# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
# compiler support for extended instruction sets (bug 552942)
Expand Down

0 comments on commit 7ff0317

Please sign in to comment.