diff options
| author |   Matteo Bernardini | 2019-08-18 16:29:50 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2019-08-18 16:29:50 +0200 |
| commit | e81a89f1b6ccd3da8cffc51b431e0026126e34b9 (patch) | |
| tree | d58abd1dad22c526d4bebefe25d34800370d6392 /libraries/qt5/qt5.SlackBuild | |
| parent | d04189e642ca17186cb9b2b5899fa9c12aceb782 (diff) | |
| download | slackbuilds-e81a89f1b6ccd3da8cffc51b431e0026126e34b9.tar.gz | |
20190818.2 global branch merge.current-20190818.2
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries/qt5/qt5.SlackBuild')
| -rw-r--r-- | libraries/qt5/qt5.SlackBuild | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild index 6d36e054f0..83f6a372d3 100644 --- a/libraries/qt5/qt5.SlackBuild +++ b/libraries/qt5/qt5.SlackBuild @@ -157,6 +157,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +# Support for openssl-1.1.x - Thanks a lot to Ole-André! +( cd qtbase + patch -p1 < $CWD/patches/qtbase59-openssl11.patch ) + +( cd qtwebengine + patch -p1 < $CWD/patches/qt5.webengine_gcc8.patch ) + # Limit -reduce-relocations to ix86 and x86_64. # https://bugreports.qt-project.org/browse/QTBUG-36129 if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then @@ -189,7 +196,7 @@ sed -i -e "/^QMAKE_LFLAGS\s/s,+=,+= $SLKLDFLAGS,g" \ qtbase/mkspecs/common/gcc-base.conf export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS -std=c++11" +export CXXFLAGS="$SLKCFLAGS" ./configure -v \ -confirm-license \ -opensource \ @@ -217,7 +224,7 @@ export CXXFLAGS="$SLKCFLAGS -std=c++11" -no-strip \ -release \ -no-use-gold-linker \ - -c++std c++11 \ + -optimized-qmake \ $CCACHE \ $CODECS \ $PULSE \ |