From 4705871f1d0f9eddb60e60983c417716b79e358d Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Sat, 5 Nov 2016 20:42:51 +0100 Subject: [PATCH] qt: remove redundant gcc6 check and patch --- srcpkgs/qt/template | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index bce41121d36..cf5360e1b0d 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -27,7 +27,7 @@ replaces="qt-qtconfig>=0" CXXFLAGS="-std=gnu++98 -Wno-deprecated" do_configure() { - local _libdir _opts _gccver + local _libdir _opts export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}" export LD="$CXX" @@ -38,13 +38,6 @@ do_configure() { _libdir=lib fi - _gccver=$(gcc --version|awk '/^gcc / { print $3 }') - if [ "${_gccver%%.*}" -gt 5 ]; then - # Enable gcc6 for building webkit (which doesn't build, though) - sed -i configure \ - -e"s;5\*|4\*|3.4\*);6*|&;" - fi - # qmake CFLAGS/LDFLAGS sed -i -e '/outpath\/qmake\".*\"\$MAKE\")/s/)/ QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" )/' \ -e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \