diff options
author | Eric Hameleers <alien@slackware.com> | 2018-06-13 14:50:49 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-06-13 14:50:49 +0200 |
commit | c779e019ac53019baa07eb843aba59bc55ffec20 (patch) | |
tree | f4dd959f71cea6ac6a8741a1a8f9933a389f5bc7 /deps/ninja | |
parent | e0d005c66dbed44be15070995d9d9e9200c989fa (diff) | |
download | ktown-c779e019ac53019baa07eb843aba59bc55ffec20.tar.gz ktown-c779e019ac53019baa07eb843aba59bc55ffec20.tar.xz |
Updated 'testing' in preparation for June '18 release of Plasma 5.13
Diffstat (limited to 'deps/ninja')
-rw-r--r-- | deps/ninja/.url | 2 | ||||
-rwxr-xr-x | deps/ninja/ninja.SlackBuild | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/deps/ninja/.url b/deps/ninja/.url index a839548..3bf2926 100644 --- a/deps/ninja/.url +++ b/deps/ninja/.url @@ -1 +1 @@ -https://github.com/ninja-build/ninja/archive/v1.6.0.tar.gz +https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz diff --git a/deps/ninja/ninja.SlackBuild b/deps/ninja/ninja.SlackBuild index 97c33ad..ec75d03 100755 --- a/deps/ninja/ninja.SlackBuild +++ b/deps/ninja/ninja.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2016 Eric Hameleers, Eindhoven, NL +# Copyright 2016, 2017 Eric Hameleers, Eindhoven, NL # Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -23,7 +23,7 @@ PKGNAM=ninja -VERSION=${VERSION:-1.6.0} +VERSION=${VERSION:-1.8.2} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -31,7 +31,7 @@ NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -43,8 +43,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then |