aboutsummaryrefslogtreecommitdiff
path: root/haskell/haskell-old-locale
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2018-10-26 10:59:29 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-11-10 07:47:36 +0700
commit629515024590a8cbb70a0919ed62cf462c2ecf41 (patch)
tree759315077599d9abd51aca04c3b9f3caf1a09a72 /haskell/haskell-old-locale
parent297ba57b86a641857c4f9a8662f2d8b366570780 (diff)
haskell/haskell-old-locale: Updated for version 1.0.0.7.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'haskell/haskell-old-locale')
-rw-r--r--haskell/haskell-old-locale/haskell-old-locale.SlackBuild13
-rw-r--r--haskell/haskell-old-locale/haskell-old-locale.info4
2 files changed, 9 insertions, 8 deletions
diff --git a/haskell/haskell-old-locale/haskell-old-locale.SlackBuild b/haskell/haskell-old-locale/haskell-old-locale.SlackBuild
index f9037c504d366..d20d26873ae91 100644
--- a/haskell/haskell-old-locale/haskell-old-locale.SlackBuild
+++ b/haskell/haskell-old-locale/haskell-old-locale.SlackBuild
@@ -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"
@@ -73,6 +73,9 @@ find -L . \
\( -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 base
+sed -i -E 's/(base *>= *[0-9.]+ *)\&\& *<=? *[0-9.]+/\1/' $SRCNAM.cabal
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
runghc Setup configure \
@@ -97,9 +100,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.md LICENSE \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a changelog.md 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-old-locale/haskell-old-locale.info b/haskell/haskell-old-locale/haskell-old-locale.info
index 46cbe461a0c12..c405d844cae96 100644
--- a/haskell/haskell-old-locale/haskell-old-locale.info
+++ b/haskell/haskell-old-locale/haskell-old-locale.info
@@ -1,7 +1,7 @@
PRGNAM="haskell-old-locale"
VERSION="1.0.0.7"
-HOMEPAGE="http://hackage.haskell.org/package/old-locale"
-DOWNLOAD="http://hackage.haskell.org/package/old-locale-1.0.0.7/old-locale-1.0.0.7.tar.gz"
+HOMEPAGE="https://hackage.haskell.org/package/old-locale"
+DOWNLOAD="https://hackage.haskell.org/package/old-locale-1.0.0.7/old-locale-1.0.0.7.tar.gz"
MD5SUM="507bd2d3ce2407403e2a2d1136c3d149"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""