diff options
| author |   Eric Hameleers <alien@slackware.com> | 2021-10-21 15:21:43 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-10-21 15:21:43 +0000 |
| commit | 9eb687ba10f3521088c8ae3d7db490e4ba8409c7 (patch) | |
| tree | 579e70f7b2864c49095b5a568e849bfd2ba6ef74 /scour | |
| parent | d4ca492e0b937c8463012c1277fd0740c8cf1cfd (diff) | |
| download | asb-9eb687ba10f3521088c8ae3d7db490e4ba8409c7.tar.gz asb-9eb687ba10f3521088c8ae3d7db490e4ba8409c7.tar.xz | |
scour: update to 0.38.2. Only add Python 2.x support for Slackware < 15.
Diffstat (limited to 'scour')
| -rwxr-xr-x | scour/build/scour.SlackBuild | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/scour/build/scour.SlackBuild b/scour/build/scour.SlackBuild index b23423c2..1685538a 100755 --- a/scour/build/scour.SlackBuild +++ b/scour/build/scour.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2020 Eric Hameleers, Eindhoven, NL +# Copyright 2020, 2021 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -31,8 +31,10 @@ # Build needs: # Needs: # Changelog: -# 0.38.1-1: 08/Nov/2020 by Eric Hameleers <alien@slackware.com> +# 0.38.1-1: 08/nov/2020 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 0.38.2-1: 21/oct/2021 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh scour.SlackBuild' to build a Slackware package. # The package (.t?z) and .txt file as well as build logs are created in /tmp . @@ -41,8 +43,8 @@ # ----------------------------------------------------------------------------- PRGNAM=scour -VERSION=${VERSION:-0.38.1} -SRCVER=${SRCVER:-038.1} +VERSION=${VERSION:-0.38.2} +SRCVER=${SRCVER:-0.38.2} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(nproc) "} TAG=${TAG:-alien} @@ -154,10 +156,13 @@ chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . echo Building ... -python2 setup.py build \ - 2>&1 | tee $OUTPUT/make-${PRGNAM}.log -python2 setup.py install --root=${PKG} --optimize=1 --skip-build \ - 2>&1 | tee $OUTPUT/install-${PRGNAM}.log +if [ $(cat /etc/slackware-version |cut -d' ' -f2 |cut -d. -f1) -lt 15 ]; then + # Python2 is deprecated since Slackware 15; + python2 setup.py build \ + 2>&1 | tee $OUTPUT/make-${PRGNAM}.log + python2 setup.py install --root=${PKG} --optimize=1 --skip-build \ + 2>&1 | tee $OUTPUT/install-${PRGNAM}.log +fi python3 setup.py build \ 2>&1 | tee $OUTPUT/make-${PRGNAM}.log python3 setup.py install --root=${PKG} --optimize=1 --skip-build \ |