From 71ae8793c7ebcc14970a75313595d908ba2f5f62 Mon Sep 17 00:00:00 2001
From: Dave Woodfall
Date: Mon, 13 Apr 2020 12:56:18 +0100
Subject: libraries/qt5-webkit: Add -reduce-relocations.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/qt5-webkit/README                |  2 --
 libraries/qt5-webkit/qt5-webkit.SlackBuild | 13 +++++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'libraries')

diff --git a/libraries/qt5-webkit/README b/libraries/qt5-webkit/README
index 98bca031ab..7783fb6e68 100644
--- a/libraries/qt5-webkit/README
+++ b/libraries/qt5-webkit/README
@@ -1,5 +1,3 @@
 QtWebkit is a Qt based web browser engine.
 
-This package contains the Qt5 based version.
-
 Optional dependencies: libwebp
diff --git a/libraries/qt5-webkit/qt5-webkit.SlackBuild b/libraries/qt5-webkit/qt5-webkit.SlackBuild
index 6255e395b9..c8693bff38 100644
--- a/libraries/qt5-webkit/qt5-webkit.SlackBuild
+++ b/libraries/qt5-webkit/qt5-webkit.SlackBuild
@@ -25,19 +25,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Adapted for 5.9.0 by David Woodfall <dave@slackbuilds.org>
+# Added some parts from -current build.
 
 PRGNAM=qt5-webkit
 SRCNAM=qtwebkit
 VERSION=${VERSION:-5.212.0_alpha4}
 SRCDIR=${SRCNAM}-$(echo $VERSION | sed -r "s,\.[[:digit:]]+_.*,,")
 SRCVERSION=$(echo v$VERSION | tr -s '_' '-')
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -76,6 +77,14 @@ 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 {} \;
 
+# Use -reduce-relocations only on i?86 and x86_64 architextures.
+# https://bugreports.qt-project.org/browse/QTBUG-36129
+if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then
+  RELOCATIONS="-reduce-relocations"
+else
+  RELOCATIONS=""
+fi
+
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
-- 
cgit v1.2.3