diff options
| author |   Matteo Bernardini | 2018-07-18 17:28:12 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2018-07-18 17:28:12 +0200 |
| commit | 3eb693602be9a059bfa02fee66fb2d04894e58c1 (patch) | |
| tree | 0cbd5eb85e6a2182f25850fa5bab9c852b256eb3 /libraries/qt5/qt5.SlackBuild | |
| parent | 296ae062cf9db17716afa30ab06ad00f1d768fb9 (diff) | |
| download | slackbuilds-current-20180718.1.tar.gz | |
20180718.1 global branch merge.current-20180718.1
Happy 25th anniversary, Slackware!
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries/qt5/qt5.SlackBuild')
| -rw-r--r-- | libraries/qt5/qt5.SlackBuild | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild index 7b829ff5f3..ac5b138ff5 100644 --- a/libraries/qt5/qt5.SlackBuild +++ b/libraries/qt5/qt5.SlackBuild @@ -108,6 +108,10 @@ patch -p1 < $CWD/patches/qt5.mysql.h.diff # Patch for the newer mozilla-nss patch -p1 < $CWD/patches/nss-update-sslv3-nonce.patch +# Patch for gcc8 on 32bit +# https://bugzilla.redhat.com/show_bug.cgi?id=1563446 +patch -p1 < $CWD/patches/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 @@ -127,9 +131,15 @@ fi echo "$PRCOD" >> qtwebengine/.qmake.conf +# Needed for gcc-7.x +( cd qtwebengine/src/3rdparty + patch -p1 < $CWD/patches/qt-5.7.1_gcc-7.patch ) + export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" ./configure -v \ + -I /usr/include/openssl-1.0 \ + -L /usr/lib${LIBDIRSUFFIX}/openssl-1.0 \ -confirm-license \ -opensource \ -prefix "/usr/lib${LIBDIRSUFFIX}/$PRGNAM" \ |