diff options
Diffstat (limited to 'haskell')
| -rw-r--r-- | haskell/haskell-test-framework-hunit/haskell-test-framework-hunit.SlackBuild | 22 | ||||
| -rw-r--r-- | haskell/haskell-test-framework-hunit/haskell-test-framework-hunit.info | 8 |
2 files changed, 17 insertions, 13 deletions
diff --git a/haskell/haskell-test-framework-hunit/haskell-test-framework-hunit.SlackBuild b/haskell/haskell-test-framework-hunit/haskell-test-framework-hunit.SlackBuild index 3b052ffcc0..25d80532f2 100644 --- a/haskell/haskell-test-framework-hunit/haskell-test-framework-hunit.SlackBuild +++ b/haskell/haskell-test-framework-hunit/haskell-test-framework-hunit.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for test-framework-hunit +# Slackware build script for haskell-test-framework-hunit # Copyright 2014 Mikko Värri, Finland +# Updated 2018 David Spencer, Baildon, West Yorkshire, U.K. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -33,7 +34,7 @@ GHC_VERSION=$(ghc --numeric-version) if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -44,8 +45,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -68,10 +69,13 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Remove bogus upper version constraint on HUnit +sed -i -E 's/(HUnit *>= *[0-9.]+ *)\&\& *<=? *[0-9.]+/\1/' $SRCNAM.cabal CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -97,7 +101,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/haskell/haskell-test-framework-hunit/haskell-test-framework-hunit.info b/haskell/haskell-test-framework-hunit/haskell-test-framework-hunit.info index fbf89d2b79..97f982ee3b 100644 --- a/haskell/haskell-test-framework-hunit/haskell-test-framework-hunit.info +++ b/haskell/haskell-test-framework-hunit/haskell-test-framework-hunit.info @@ -1,10 +1,10 @@ PRGNAM="haskell-test-framework-hunit" VERSION="0.3.0.2" -HOMEPAGE="http://hackage.haskell.org/package/test-framework-hunit" -DOWNLOAD="http://hackage.haskell.org/package/test-framework-hunit-0.3.0.2/test-framework-hunit-0.3.0.2.tar.gz" +HOMEPAGE="https://hackage.haskell.org/package/test-framework-hunit" +DOWNLOAD="https://hackage.haskell.org/package/test-framework-hunit-0.3.0.2/test-framework-hunit-0.3.0.2.tar.gz" MD5SUM="71fb3dd76524682c437208b5b5ef1adb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="haskell-extensible-exceptions haskell-HUnit haskell-test-framework" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com" |