diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 00e7c12d1e5..9195041cb0e 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,7 +1,7 @@ # Template file for 'qt5' pkgname=qt5 version=5.6.2 -revision=2 +revision=3 wrksrc="qt-everywhere-opensource-src-${version}" homepage="http://qt.io/" short_desc="A cross-platform application and UI framework (QT5)" @@ -33,11 +33,6 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 CFLAGS="-DOPENSSL_NO_SSL3_METHOD" CXXFLAGS="-DOPENSSL_NO_SSL3_METHOD" -_gccver=$(gcc --version | awk '/^gcc \(GCC\)/ { print $3 }') -if [ "${_gccver%%.*}" -gt 5 ]; then - CXXFLAGS+=" -fno-delete-null-pointer-checks" -fi - if [ -n "$CROSS_BUILD" ]; then # Need some devel packages in the host to build qmake, moc, uic, rcc # wayland-devel contains /usr/bin/wayland-scanner @@ -135,6 +130,11 @@ _create_config() { } pre_configure() { + local _gccver=$(gcc --version | awk '/^gcc \(GCC\)/ { print $3 }') + if [ "${_gccver%%.*}" -gt 5 ]; then + CXXFLAGS+=" -fno-delete-null-pointer-checks" + fi + # Compatibility functions res_ninit() and res_nclose() for musl libc cp ${FILESDIR}/resolv_compat.h ${wrksrc}/qtwebengine/src/3rdparty/chromium/net/dns case "$XBPS_TARGET_MACHINE" in