Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=b2e8ca27697b731c1934a476911d665c1e8f5b81
commit b2e8ca27697b731c1934a476911d665c1e8f5b81 Author: crazy <[email protected]> Date: Sat Feb 3 00:18:05 2018 +0100 qt.sh: implement _F_qt_extra_cxx * sometimes we want to add some more CXXFLAGS eg: some with -fno-xx etc and since qmake is stupid we have to qmake QMAKE_CXXFLAGS+=" ..." etc for things like this just use _F_qt_extra_cxx=" -foo-something" diff --git a/source/include/qt5.sh b/source/include/qt5.sh index 31e5826..e13983a 100644 --- a/source/include/qt5.sh +++ b/source/include/qt5.sh @@ -32,23 +32,17 @@ up2date="Flastverdir http://download.qt-project.org/official_releases/qt/\$(Flas _F_cd_path=${qtpkgfilename} makedepends+=('x11-protos' 'gperf') +_qt_extra_cxx=" -Wno-deprecated -Wno-deprecated-declarations" -## From gcc6 docs -## Value range propagation now assumes that the this pointer of C++ member functions is non-null. This eliminates common -## null pointer checks but also breaks some non-conforming code-bases (such as Qt-5, Chromium, KDevelop). As a temporary -## work-around -fno-delete-null-pointer-checks can be used. Wrong code can be identified by using -fsanitize=undefined. - -_F_QT5_GCC_VER=$(gcc --version | head -n1 | cut -d" " -f4) - -case "$_F_QT5_GCC_VER" in -6.*) CXXFLAGS+=" -fno-delete-null-pointer-checks -Wno-deprecated -Wno-deprecated-declarations";; -esac +if [ -n "$_F_qt_extra_cxx" ]; then + _qt_extra_cxx+=" ${_F_qt_extra_cxx[@]}" +fi build_qt5() { Fcd Fpatchall - qmake-qt5 || Fdie + qmake-qt5 QMAKE_CXXFLAGS+=" ${_qt_extra_cxx[@]}" || Fdie Fmake make INSTALL_ROOT=$Fdestdir install || Fdie if [ -d "${Fdestdir}/usr/lib/qt5/bin" ]; then _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
