diff options
| -rw-r--r-- | haskell/haskell-colour/haskell-colour.SlackBuild | 12 | ||||
| -rw-r--r-- | haskell/haskell-colour/haskell-colour.info | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/haskell/haskell-colour/haskell-colour.SlackBuild b/haskell/haskell-colour/haskell-colour.SlackBuild index 132c7ad918..1b5088ad2f 100644 --- a/haskell/haskell-colour/haskell-colour.SlackBuild +++ b/haskell/haskell-colour/haskell-colour.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=haskell-colour -VERSION=${VERSION:-2.3.3} +VERSION=${VERSION:-2.3.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -33,7 +33,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 +44,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" @@ -97,9 +97,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 \ - CHANGELOG LICENSE README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG LICENSE README $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-colour/haskell-colour.info b/haskell/haskell-colour/haskell-colour.info index b502d31b25..573a212b60 100644 --- a/haskell/haskell-colour/haskell-colour.info +++ b/haskell/haskell-colour/haskell-colour.info @@ -1,8 +1,8 @@ PRGNAM="haskell-colour" -VERSION="2.3.3" -HOMEPAGE="http://hackage.haskell.org/package/colour" -DOWNLOAD="http://hackage.haskell.org/package/colour-2.3.3/colour-2.3.3.tar.gz" -MD5SUM="6bfdc3f932f581b58b7444381f469777" +VERSION="2.3.4" +HOMEPAGE="https://hackage.haskell.org/package/colour" +DOWNLOAD="https://hackage.haskell.org/package/colour-2.3.4/colour-2.3.4.tar.gz" +MD5SUM="a0f05806a965741447ecbe3f5b41c3c9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ghc" |