From 727a55eec1c1fe9be9094b1098a622e7a1f91f26 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 22 Dec 2017 00:33:08 +0100 Subject: deps: updates and recompilations --- deps/ninja/.url | 2 +- deps/ninja/ninja.SlackBuild | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'deps/ninja') diff --git a/deps/ninja/.url b/deps/ninja/.url index 93678d7..3bf2926 100644 --- a/deps/ninja/.url +++ b/deps/ninja/.url @@ -1 +1 @@ -https://github.com/ninja-build/ninja/archive/v1.7.2.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 e3a1ad9..ec75d03 100755 --- a/deps/ninja/ninja.SlackBuild +++ b/deps/ninja/ninja.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=ninja -VERSION=${VERSION:-1.7.2} +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 -- cgit v1.2.3