qt: remove redundant gcc6 check and patch
This commit is contained in:
parent
90159a7c5c
commit
4705871f1d
|
@ -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\).*/:/' \
|
||||
|
|
Loading…
Reference in New Issue