summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-04-28 18:57:28 +0000
committer Eric Hameleers <alien@slackware.com>2020-04-28 18:57:28 +0000
commitf3b08212c2fbb5bbc8150ba5d3c065ac4d9f7820 (patch)
treec8b7125c564251f9b9e30d8b4122457f2a8d052e
parent0e52b61a69d5ffb3dab3c96cb560ba7e219937b7 (diff)
downloadasb-f3b08212c2fbb5bbc8150ba5d3c065ac4d9f7820.tar.gz
asb-f3b08212c2fbb5bbc8150ba5d3c065ac4d9f7820.tar.xz
ninja: update to 1.10.0
-rwxr-xr-xninja/build/ninja.SlackBuild10
1 files changed, 6 insertions, 4 deletions
diff --git a/ninja/build/ninja.SlackBuild b/ninja/build/ninja.SlackBuild
index c27d35b8..32f8f20a 100755
--- a/ninja/build/ninja.SlackBuild
+++ b/ninja/build/ninja.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
# $Id$
-# Copyright 2014, 2016 Eric Hameleers, Eindhoven, NL
+# Copyright 2014, 2016, 2020 Eric Hameleers, Eindhoven, NL
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -37,6 +37,8 @@
# * Update.
# 1.7.2-1: 29/nov/2016 by Eric Hameleers <alien@slackware.com>
# * Update.
+# 1.10.0-1: 28/apr/2020 by Eric Hameleers <alien@slackware.com>
+# * Update.
#
# Run 'sh ninja.SlackBuild' to build a Slackware package.
# The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -45,9 +47,9 @@
# -----------------------------------------------------------------------------
PRGNAM=ninja
-VERSION=${VERSION:-1.7.2}
+VERSION=${VERSION:-1.10.0}
BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:" -j$(nproc) "}
TAG=${TAG:-alien}
DOCS="COPYING HACKING.md README RELEASING"
@@ -81,7 +83,7 @@ if [ -z "$ARCH" ]; then
fi
case "$ARCH" in
- i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
SLKLDFLAGS=""; LIBDIRSUFFIX=""
;;
x86_64) SLKCFLAGS="-O2 -fPIC"