From c4eaef19b5e3bdc8c4434b8361dff2b267b02b61 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 12 Oct 2019 08:21:51 +0200
Subject: 20191012.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 network/rtorrent/rtorrent.SlackBuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'network/rtorrent/rtorrent.SlackBuild')

diff --git a/network/rtorrent/rtorrent.SlackBuild b/network/rtorrent/rtorrent.SlackBuild
index f5ee018aff..421bf99503 100644
--- a/network/rtorrent/rtorrent.SlackBuild
+++ b/network/rtorrent/rtorrent.SlackBuild
@@ -17,7 +17,7 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -28,8 +28,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -42,6 +42,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+xmlrpcc="" ; [ -x /usr/bin/xmlrpc-c-config ] && xmlrpcc="--with-xmlrpc-c"
+
 set -e
 
 rm -rf $PKG
@@ -66,6 +68,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  $xmlrpcc \
+  --disable-debug \
   --build=$ARCH-slackware-linux
 
 make
-- 
cgit v1.2.3