logo

overlay

Personnal gentoo overlay
commit: a3d39e22027e6e81d0752df7d3426355a3fade54
parent: 84a99ce573587a8e45812b8fbf558e1e4353869e
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Tue,  4 Jul 2017 07:48:28 +0200

dev-qt/qtwebengine: Try#1 to fix QT_GCC_{MINOR,MAJOR}_VERSION

Diffstat:

dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild | 4++++
dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild | 4++++
2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild @@ -90,6 +90,10 @@ src_prepare() { src_configure() { export NINJA_PATH=/usr/bin/ninja + my_gcc_version=$(gcc --version | head -1 | sed -r 's|.*\) (.*)$|\1|') + qmake -set QT_GCC_MINOR_VERSION $(echo $my_gcc_version | cut -d. -f2) + qmake -set QT_GCC_MAJOR_VERSION $(echo $my_gcc_version | cut -d. -f1) + local myqmakeargs=( $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild @@ -100,6 +100,10 @@ src_configure() { export NINJA_PATH=/usr/bin/ninja export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + my_gcc_version=$(gcc --version | head -1 | sed -r 's|.*\) (.*)$|\1|') + qmake -set QT_GCC_MINOR_VERSION $(echo $my_gcc_version | cut -d. -f2) + qmake -set QT_GCC_MAJOR_VERSION $(echo $my_gcc_version | cut -d. -f1) + local myqmakeargs=( $(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '') $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')