From e36943bc3c7a1273fc31f9b9fb2a13bdf9ba5043 Mon Sep 17 00:00:00 2001 From: Larry Hajali Date: Thu, 22 Jun 2017 17:01:16 -0700 Subject: libraries/tinyxml2: Updated for version 5.0.0 Signed-off-by: Larry Hajali --- libraries/tinyxml2/tinyxml2.SlackBuild | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'libraries/tinyxml2/tinyxml2.SlackBuild') diff --git a/libraries/tinyxml2/tinyxml2.SlackBuild b/libraries/tinyxml2/tinyxml2.SlackBuild index ab8f6d85c661b..1ff5de0ea175b 100644 --- a/libraries/tinyxml2/tinyxml2.SlackBuild +++ b/libraries/tinyxml2/tinyxml2.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tinyxml2 -# Copyright 2014-2016 Larry Hajali +# Copyright 2014-2017 Larry Hajali # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tinyxml2 -VERSION=${VERSION:-4.0.1} +VERSION=${VERSION:-5.0.0} 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 @@ -40,8 +40,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" @@ -76,6 +76,9 @@ for i in *.cpp *.h; do mv ${i}.new $i done +# Fix Cmake install directory. +sed -i "s|lib/cmake|lib${LIBDIRSUFFIX}/cmake|" CMakeLists.txt + mkdir build cd build cmake -G "Unix Makefiles" \ -- cgit v1.2.3