From e640e49a5bd5cb8a3b272af2d38aa2c5d9993949 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Mon, 26 Oct 2020 22:06:13 +0100
Subject: 20201026.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 libraries/libevhtp/libevhtp.SlackBuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'libraries/libevhtp/libevhtp.SlackBuild')

diff --git a/libraries/libevhtp/libevhtp.SlackBuild b/libraries/libevhtp/libevhtp.SlackBuild
index 4b6993221c..0697ea8e9c 100644
--- a/libraries/libevhtp/libevhtp.SlackBuild
+++ b/libraries/libevhtp/libevhtp.SlackBuild
@@ -25,13 +25,13 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libevhtp
-VERSION=${VERSION:-1.2.10}
+VERSION=${VERSION:-1.2.16}
 BUILD=${BUILD:-1}
 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
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -74,6 +74,8 @@ find -L . \
 # fix wrong version number
 sed -i "s/@PROJECT_VERSION@/${VERSION}/" evhtp.pc.in
 
+sed -i "s|/lib/pkgconfig|/lib$LIBDIRSUFFIX/pkgconfig|" CMakeLists.txt
+
 mkdir -p build
 cd build
   cmake \
-- 
cgit v1.2.3