diff options
author | Eric Hameleers <alien@slackware.com> | 2017-12-22 00:33:08 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2017-12-22 00:33:08 +0100 |
commit | 727a55eec1c1fe9be9094b1098a622e7a1f91f26 (patch) | |
tree | 18ad1a4f0b9e6654b2a5d1ee7899106abb1f3c49 /deps/json-glib/json-glib.SlackBuild | |
parent | efc2d632e715498adf632904e2425a5d89e1e44f (diff) | |
download | ktown-727a55eec1c1fe9be9094b1098a622e7a1f91f26.tar.gz ktown-727a55eec1c1fe9be9094b1098a622e7a1f91f26.tar.xz |
deps: updates and recompilations
Diffstat (limited to 'deps/json-glib/json-glib.SlackBuild')
-rwxr-xr-x | deps/json-glib/json-glib.SlackBuild | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/deps/json-glib/json-glib.SlackBuild b/deps/json-glib/json-glib.SlackBuild index 4af8d2a..68344c0 100755 --- a/deps/json-glib/json-glib.SlackBuild +++ b/deps/json-glib/json-glib.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=json-glib -VERSION=${VERSION:-1.2.8} +VERSION=${VERSION:-1.4.2} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j4 "} @@ -33,38 +33,33 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ -e $CWD/machine.conf ]; then - . $CWD/machine.conf ] -elif [ -e /etc/slackbuild/machine.conf ]; then - . /etc/slackbuild/machine.conf ] +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + 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) ;; + esac + export ARCH +fi + +# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv5te" + LIBDIRSUFFIX="" else - # Automatically determine the architecture we're building on: - MARCH=$( uname -m ) - if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac - fi - # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: - if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv5te" - LIBDIRSUFFIX="" - else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - fi + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi case "$ARCH" in |