diff options
| -rw-r--r-- | libraries/tinyxml2/tinyxml2.SlackBuild | 13 | ||||
| -rw-r--r-- | libraries/tinyxml2/tinyxml2.info | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/libraries/tinyxml2/tinyxml2.SlackBuild b/libraries/tinyxml2/tinyxml2.SlackBuild index ab8f6d85c6..1ff5de0ea1 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 <larryhaja[at]gmail[dot]com> +# Copyright 2014-2017 Larry Hajali <larryhaja[at]gmail[dot]com> # 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" \ diff --git a/libraries/tinyxml2/tinyxml2.info b/libraries/tinyxml2/tinyxml2.info index 9ca6b65964..698da528bd 100644 --- a/libraries/tinyxml2/tinyxml2.info +++ b/libraries/tinyxml2/tinyxml2.info @@ -1,8 +1,8 @@ PRGNAM="tinyxml2" -VERSION="4.0.1" +VERSION="5.0.0" HOMEPAGE="http://www.grinninglizard.com/tinyxml2/index.html" -DOWNLOAD="https://github.com/leethomason/tinyxml2/archive/4.0.1/tinyxml2-4.0.1.tar.gz" -MD5SUM="36aed868b751e728fa8f714aa3376a1d" +DOWNLOAD="https://github.com/leethomason/tinyxml2/archive/5.0.0/tinyxml2-5.0.0.tar.gz" +MD5SUM="74b4c767c452e0e4155cb6dae8ed7e87" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |