summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorMikko Värri <vmj@linuxbox.fi>2010-07-16 15:03:12 -0500
committerErik Hanson <erik@slackbuilds.org>2010-07-21 01:42:41 -0500
commit42edbb0a5a55dd60a2da1b05b686af86d993497b (patch)
treebeface2145046e8cbcb8ead8f87962b829d6bc82 /libraries
parent109b1a3e80ca11bcff787a128fc727019dd2a4ee (diff)
downloadslackbuilds-42edbb0a5a55dd60a2da1b05b686af86d993497b.tar.gz
libraries/haskell-zlib: Build bump, various changes. New maintainer.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/haskell-zlib/README4
-rw-r--r--libraries/haskell-zlib/doinst.sh1
-rw-r--r--libraries/haskell-zlib/haskell-zlib.SlackBuild42
-rw-r--r--libraries/haskell-zlib/haskell-zlib.info6
4 files changed, 39 insertions, 14 deletions
diff --git a/libraries/haskell-zlib/README b/libraries/haskell-zlib/README
index fc3cea429f..b2435f0eb2 100644
--- a/libraries/haskell-zlib/README
+++ b/libraries/haskell-zlib/README
@@ -5,5 +5,5 @@ It uses the zlib C library so it has high performance. It supports the "zlib",
This requires ghc.
-When uninstalling, run the following command to unregister the package
-from the ghc package database: ghc-pkg unregister zlib
+After uninstalling, run the following command to unregister the package
+from the ghc package database: ghc-pkg recache
diff --git a/libraries/haskell-zlib/doinst.sh b/libraries/haskell-zlib/doinst.sh
new file mode 100644
index 0000000000..3268c238bf
--- /dev/null
+++ b/libraries/haskell-zlib/doinst.sh
@@ -0,0 +1 @@
+chroot . /usr/bin/ghc-pkg recache
diff --git a/libraries/haskell-zlib/haskell-zlib.SlackBuild b/libraries/haskell-zlib/haskell-zlib.SlackBuild
index 1cae7f08ea..0731a9eb76 100644
--- a/libraries/haskell-zlib/haskell-zlib.SlackBuild
+++ b/libraries/haskell-zlib/haskell-zlib.SlackBuild
@@ -1,28 +1,45 @@
#!/bin/sh
-# Slackware build script for haskell-zlib
+# Slackware build script for zlib
# Written by Peter Wang <novalazy@gmail.com>
+# Modified by Mikko Värri <vmj@linuxbox.fi>
+# Public domain.
-PRGNAM=haskell-zlib
SRCNAM=zlib
+PRGNAM=haskell-$SRCNAM
VERSION=${VERSION:-0.5.2.0}
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
-GHC_VERSION=$(ghc-pkg field ghc version | cut -d' ' -f2)
+GHC_VERSION=$(ghc --numeric-version)
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "i486" ]; then
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
else
+ SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
-fi
+fi
set -e # Exit on most errors
@@ -39,6 +56,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
runghc Setup.hs configure \
--prefix=/usr \
--enable-shared \
@@ -49,15 +68,20 @@ runghc Setup.hs configure \
runghc Setup.hs build
runghc Setup.hs haddock
runghc Setup.hs copy --destdir=$PKG
-runghc Setup.hs register --gen-script
+runghc Setup.hs register --gen-pkg-config
+
+PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d
+PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | cut -d" " -f2 )
+mkdir -p $PKG/$PKGCONFD
+mv $SRCNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
mkdir -p $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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
-cat register.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/haskell-zlib/haskell-zlib.info b/libraries/haskell-zlib/haskell-zlib.info
index 83990ef8fb..11cc4b3bf1 100644
--- a/libraries/haskell-zlib/haskell-zlib.info
+++ b/libraries/haskell-zlib/haskell-zlib.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://hackage.haskell.org/packages/archive/zlib/0.5.2.0/zlib-0.5.2.0.
MD5SUM="19859e241dc18ef1501a5d44d8523507"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-MAINTAINER="Peter Wang"
-EMAIL="novalazy@gmail.com"
-APPROVED="dsomero"
+MAINTAINER="Mikko Värri"
+EMAIL="vmj@linuxbox.fi"
+APPROVED="Erik Hanson"