diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-06-10 12:31:36 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-06-10 12:31:36 +0000 |
| commit | fe3ca6f5b987c3380298a3d98e20f28bca85b9c9 (patch) | |
| tree | 799d62f59767c56606daa7c8e89b032774c88e8a /NetworkManager-openconnect | |
| parent | 7dd85b8796781c6affc0d3cbbd434a6e93300551 (diff) | |
| download | asb-fe3ca6f5b987c3380298a3d98e20f28bca85b9c9.tar.gz asb-fe3ca6f5b987c3380298a3d98e20f28bca85b9c9.tar.xz | |
NetworkManager-openconnect: Rebuilt for slackware-current
Diffstat (limited to 'NetworkManager-openconnect')
| -rwxr-xr-x | NetworkManager-openconnect/build/NetworkManager-openconnect.SlackBuild | 62 |
1 files changed, 28 insertions, 34 deletions
diff --git a/NetworkManager-openconnect/build/NetworkManager-openconnect.SlackBuild b/NetworkManager-openconnect/build/NetworkManager-openconnect.SlackBuild index 769d3021..812c74f3 100755 --- a/NetworkManager-openconnect/build/NetworkManager-openconnect.SlackBuild +++ b/NetworkManager-openconnect/build/NetworkManager-openconnect.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2017, 2018 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,6 +33,8 @@ # Changelog: # 1.2.4-1: 26/jun/2017 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 1.2.4-2: 10/jun/2018 by Eric Hameleers <alien@slackware.com> +# * Rebuilt for slackware-current. # # Run 'sh NetworkManager-openconnect.SlackBuild' to build a Slackware package. # The package (.t?z) and .txt file as well as build logs are created in /tmp . @@ -42,8 +44,8 @@ PRGNAM=NetworkManager-openconnect VERSION=${VERSION:-1.2.4} -BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j4 "} +BUILD=${BUILD:-2} +NUMJOBS=${NUMJOBS:-"-j$(nproc)"} TAG=${TAG:-alien} DOCS="AUTHORS COPYING ChangeLog NEWS README" @@ -63,39 +65,31 @@ SRCURL="http://download.gnome.org/sources/${PRGNAM}/$(echo $VERSION |cut -d. -f1 ## --- with a little luck, you won't have to edit below this point --- ## ## -# You can use your own private machine.conf file to overrule machine defaults: -if [ -e $SRCDIR/machine.conf ]; then - . $SRCDIR/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=i586 ;; - armv7hl) export ARCH=$MARCH ;; - 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: - 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:-""} - ;; +# 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 ;; |