summaryrefslogtreecommitdiffstats
path: root/haskell/haskell-old-time/haskell-old-time.SlackBuild
diff options
context:
space:
mode:
author David Spencer2018-10-26 11:59:30 +0200
committer Willy Sudiarto Raharjo2018-11-10 01:47:36 +0100
commitd94f0ddfe1b88b3613a632296a93e1b23526ac00 (patch)
tree117bb21ab1df9f16c93c50de37c53c008b70d0b8 /haskell/haskell-old-time/haskell-old-time.SlackBuild
parent629515024590a8cbb70a0919ed62cf462c2ecf41 (diff)
downloadslackbuilds-d94f0ddfe1b88b3613a632296a93e1b23526ac00.tar.gz
haskell/haskell-old-time: Updated for version 1.1.0.3.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'haskell/haskell-old-time/haskell-old-time.SlackBuild')
-rw-r--r--haskell/haskell-old-time/haskell-old-time.SlackBuild13
1 files changed, 7 insertions, 6 deletions
diff --git a/haskell/haskell-old-time/haskell-old-time.SlackBuild b/haskell/haskell-old-time/haskell-old-time.SlackBuild
index 14ac6694b9..766e6f4365 100644
--- a/haskell/haskell-old-time/haskell-old-time.SlackBuild
+++ b/haskell/haskell-old-time/haskell-old-time.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