diff options
author | Eric Hameleers <alien@slackware.com> | 2019-03-02 00:59:01 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-03-02 00:59:01 +0000 |
commit | fadc4cf2f4bcb3556b4a7a643fe265e8ba00b412 (patch) | |
tree | fc900a03c4ed9938e3fad99832f78ea8d6ec94de /libconfig | |
parent | 59487125fd7105eb7c15a8c542acbdf3864c3280 (diff) | |
download | asb-fadc4cf2f4bcb3556b4a7a643fe265e8ba00b412.tar.gz asb-fadc4cf2f4bcb3556b4a7a643fe265e8ba00b412.tar.xz |
libconfig: updated to 1.7.2
Diffstat (limited to 'libconfig')
-rwxr-xr-x | libconfig/build/libconfig.SlackBuild | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/libconfig/build/libconfig.SlackBuild b/libconfig/build/libconfig.SlackBuild index 46d3b732..532d698b 100755 --- a/libconfig/build/libconfig.SlackBuild +++ b/libconfig/build/libconfig.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2014, 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2014, 2017, 2019 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -35,6 +35,8 @@ # * Initial build. # 1.6-1: 11/oct/2017 by Eric Hameleers <alien@slackware.com> # * Update. +# 1.7.2-1: 02/mar/2019 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh libconfig.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -43,9 +45,9 @@ # ----------------------------------------------------------------------------- PRGNAM=libconfig -VERSION=${VERSION:-1.6} +VERSION=${VERSION:-1.7.2} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:" -j4 "} +NUMJOBS=${NUMJOBS:-" -j$(nproc) "} TAG=${TAG:-alien} DOCS="AUTHORS COPYING.LIB ChangeLog INSTALL README" @@ -66,20 +68,18 @@ SRCURL="https://github.com/hyperrealm/${PRGNAM}/archive/v${VERSION}.tar.gz" ## # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - armv6hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + 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: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi - +# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; x86_64) SLKCFLAGS="-O2 -fPIC" @@ -88,10 +88,7 @@ case "$ARCH" in armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; - armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - *) SLKCFLAGS=${SLKCFLAGS:-"O2"} + *) SLKCFLAGS=${SLKCFLAGS:-"-O2"} SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} ;; esac @@ -174,6 +171,7 @@ CFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ + --infodir=/usr/info \ --docdir=/usr/doc/${PRGNAM}-${VERSION} \ --localstatedir=/var \ --sysconfdir=/etc \ |