diff options
| author |   Eric Hameleers <alien@slackware.com> | 2017-10-11 19:05:11 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2017-10-11 19:05:11 +0000 |
| commit | 90aa3002265a89d06413f4b0ae022c1e5372ce33 (patch) | |
| tree | e4a811bc5ba8416702dc30f46f6806b660292d7e /libconfig | |
| parent | a71c730775e343e6e7e65e3bede2b17b42bcf518 (diff) | |
| download | asb-90aa3002265a89d06413f4b0ae022c1e5372ce33.tar.gz asb-90aa3002265a89d06413f4b0ae022c1e5372ce33.tar.xz | |
libconfig: update to 1.6
Diffstat (limited to 'libconfig')
| -rwxr-xr-x | libconfig/build/libconfig.SlackBuild | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/libconfig/build/libconfig.SlackBuild b/libconfig/build/libconfig.SlackBuild index 6d33aed6..46d3b732 100755 --- a/libconfig/build/libconfig.SlackBuild +++ b/libconfig/build/libconfig.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2014 Eric Hameleers, Eindhoven, NL +# Copyright 2014, 2017 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,6 +33,8 @@ # Changelog: # 1.4.9-1: 05/Mar/2014 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 1.6-1: 11/oct/2017 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 . @@ -41,7 +43,7 @@ # ----------------------------------------------------------------------------- PRGNAM=libconfig -VERSION=${VERSION:-1.4.9} +VERSION=${VERSION:-1.6} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -57,7 +59,7 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz" -SRCURL="http://www.hyperrealm.com/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz" +SRCURL="https://github.com/hyperrealm/${PRGNAM}/archive/v${VERSION}.tar.gz" ## ## --- with a little luck, you won't have to edit below this point --- ## @@ -127,7 +129,7 @@ if ! [ -f ${SOURCE} ]; then if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi if ! [ "x${SRCURL}" == "x" ]; then echo "Will download file to $(dirname $SOURCE)" - wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true + wget -nv -T 20 --content-disposition --no-check-certificate -O "${SOURCE}" "${SRCURL}" || true if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then echo "Downloading '$(basename ${SOURCE})' failed... aborting the build." mv -f "${SOURCE}" "${SOURCE}".FAIL @@ -158,15 +160,21 @@ chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . echo Building ... +# The re-generated lib/scanner.[ch] were not included in the tarball. +# The version included in the tarball corresponds to a previous version +# of the library (1.5): +rm -f lib/scanner.{c,h} + +[ -x autogen.sh ] && ./autogen.sh + LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --infodir=/usr/man \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/${PRGNAM}-${VERSION} \ --localstatedir=/var \ --sysconfdir=/etc \ --program-prefix= \ |