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/json-glib | |
| 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/json-glib')
| -rw-r--r-- | deps/json-glib/.url | 1 | ||||
| -rwxr-xr-x | deps/json-glib/json-glib.SlackBuild | 63 |
2 files changed, 30 insertions, 34 deletions
diff --git a/deps/json-glib/.url b/deps/json-glib/.url new file mode 100644 index 0000000..f6f66ba --- /dev/null +++ b/deps/json-glib/.url @@ -0,0 +1 @@ +http://ftp.gnome.org/pub/gnome/sources/json-glib/1.4/json-glib-1.4.2.tar.xz diff --git a/deps/json-glib/json-glib.SlackBuild b/deps/json-glib/json-glib.SlackBuild index 4975cb1..68344c0 100755 --- a/deps/json-glib/json-glib.SlackBuild +++ b/deps/json-glib/json-glib.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2015 Eric Hameleers, Eindhoven, NL +# Copyright 2015, 2017 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -24,47 +24,42 @@ PKGNAM=json-glib -VERSION=${VERSION:-1.0.4} +VERSION=${VERSION:-1.4.2} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:" -j4 "} +NUMJOBS=${NUMJOBS:-" -j4 "} 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 |