diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-10-02 19:57:03 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-10-02 19:57:03 +0000 |
| commit | 560a910ac4ef512289b6ee49b02f083438d0723c (patch) | |
| tree | 0937f7b70fd146dd904bd458a523f61d875b78de | |
| parent | 9aea297effdd403b50d7b6bb64af8a0f7060aaae (diff) | |
| download | asb-560a910ac4ef512289b6ee49b02f083438d0723c.tar.gz asb-560a910ac4ef512289b6ee49b02f083438d0723c.tar.xz | |
libinput: update to 1.7.3
| -rwxr-xr-x | libinput/build/libinput.SlackBuild | 60 |
1 files changed, 26 insertions, 34 deletions
diff --git a/libinput/build/libinput.SlackBuild b/libinput/build/libinput.SlackBuild index c3da20c5..13a8a6f5 100755 --- a/libinput/build/libinput.SlackBuild +++ b/libinput/build/libinput.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2016, 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -24,7 +24,7 @@ PKGNAM=libinput -VERSION=${VERSION:-1.5.4} +VERSION=${VERSION:-1.7.3} BUILD=${BUILD:-1} # Support for (wacom) tablets requires libwacom as additional dependency: @@ -36,39 +36,31 @@ 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 ] -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 +# 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: +case "$ARCH" in + i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + x86_64) SLKCFLAGS="-O2 -fPIC" + SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" + ;; + armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + *) SLKCFLAGS=${SLKCFLAGS:-"-O2"} + SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} + ;; +esac case "$ARCH" in arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; |