diff options
author | Eric Hameleers <alien@slackware.com> | 2017-09-11 16:15:32 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2017-09-11 16:15:32 +0000 |
commit | 0d3406403da501107289d95cd95e7391146acbfc (patch) | |
tree | f20bcc07cf894a839efa96286b1f4dcbbea6ef1f /libxkbcommon/build/libxkbcommon.SlackBuild | |
parent | f1ed1e907ac89daf59c3b96d87ec83f7c8552aee (diff) | |
download | asb-0d3406403da501107289d95cd95e7391146acbfc.tar.gz asb-0d3406403da501107289d95cd95e7391146acbfc.tar.xz |
libxkbcommon: updated to 0.7.2
Diffstat (limited to 'libxkbcommon/build/libxkbcommon.SlackBuild')
-rwxr-xr-x | libxkbcommon/build/libxkbcommon.SlackBuild | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/libxkbcommon/build/libxkbcommon.SlackBuild b/libxkbcommon/build/libxkbcommon.SlackBuild index e21cf70b..d80e2bfa 100755 --- a/libxkbcommon/build/libxkbcommon.SlackBuild +++ b/libxkbcommon/build/libxkbcommon.SlackBuild @@ -23,45 +23,40 @@ PKGNAM=libxkbcommon -VERSION=${VERSION:-0.7.1} +VERSION=${VERSION:-0.7.2} BUILD=${BUILD:-1} 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=i486 ;; + 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" = "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 - # 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 |