diff options
| -rw-r--r-- | haskell/haskell-hashable/haskell-hashable.SlackBuild | 17 | ||||
| -rw-r--r-- | haskell/haskell-hashable/haskell-hashable.info | 14 | ||||
| -rw-r--r-- | haskell/haskell-hashable/slack-desc | 2 |
3 files changed, 17 insertions, 16 deletions
diff --git a/haskell/haskell-hashable/haskell-hashable.SlackBuild b/haskell/haskell-hashable/haskell-hashable.SlackBuild index 0f31d2b8a5f2..76c2bdefa86e 100644 --- a/haskell/haskell-hashable/haskell-hashable.SlackBuild +++ b/haskell/haskell-hashable/haskell-hashable.SlackBuild @@ -4,6 +4,7 @@ # Copyright 2014 Google Inc, Germany # Copyright 2015 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 @@ -24,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=haskell-hashable -VERSION=${VERSION:-1.2.4.0} +VERSION=${VERSION:-1.2.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -34,7 +35,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 @@ -45,8 +46,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" @@ -72,16 +73,16 @@ 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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ runghc Setup configure \ --prefix=/usr \ - --enable-shared \ - --enable-library-profiling \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \ + --enable-shared \ + --enable-library-profiling \ --docdir=/usr/doc/$PRGNAM-$VERSION runghc Setup build @@ -102,8 +103,8 @@ cp -a CHANGES.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/haskell/haskell-hashable/haskell-hashable.info b/haskell/haskell-hashable/haskell-hashable.info index 044b4e9551e3..ea97c61b525a 100644 --- a/haskell/haskell-hashable/haskell-hashable.info +++ b/haskell/haskell-hashable/haskell-hashable.info @@ -1,10 +1,10 @@ PRGNAM="haskell-hashable" -VERSION="1.2.4.0" -HOMEPAGE="http://hackage.haskell.org/package/hashable" -DOWNLOAD="http://hackage.haskell.org/package/hashable-1.2.4.0/hashable-1.2.4.0.tar.gz" -MD5SUM="55c2b3ce96fb4861e1f6e6b50a8182cc" +VERSION="1.2.7.0" +HOMEPAGE="https://hackage.haskell.org/package/hashable" +DOWNLOAD="https://hackage.haskell.org/package/hashable-1.2.7.0/hashable-1.2.7.0.tar.gz" +MD5SUM="dea6feafb84f3c035b6053a21bd25147" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="haskell-text" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" +REQUIRES="ghc" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com" diff --git a/haskell/haskell-hashable/slack-desc b/haskell/haskell-hashable/slack-desc index e8b3e24fed00..5ad2ba67be7c 100644 --- a/haskell/haskell-hashable/slack-desc +++ b/haskell/haskell-hashable/slack-desc @@ -15,5 +15,5 @@ haskell-hashable: converted to a hash value. This class exists for the benefit o haskell-hashable: hashing-based data structures. The package provides instances for haskell-hashable: basic types and a way to combine hash values. haskell-hashable: -haskell-hashable: http://hackage.haskell.org/package/hashable +haskell-hashable: https://hackage.haskell.org/package/hashable haskell-hashable: |