diff options
author | Mikko Varri | 2010-05-13 00:24:41 +0200 |
---|---|---|
committer | Robby Workman | 2010-05-13 00:24:41 +0200 |
commit | d16839b41c307586ca1dd825aaf47d95fb43b248 (patch) | |
tree | 92bd3929b7276644da845e3e0b6474eaf332dcfe | |
parent | fb0fdd042e8729f5d942dfc8693f1783b3d27d24 (diff) | |
download | slackbuilds-d16839b41c307586ca1dd825aaf47d95fb43b248.tar.gz |
development/ghc: Updated for version 6.12.1
-rw-r--r-- | development/ghc/README | 10 | ||||
-rw-r--r-- | development/ghc/docs_ext-core_Makefile.patch | 13 | ||||
-rw-r--r-- | development/ghc/ghc.SlackBuild | 37 | ||||
-rw-r--r-- | development/ghc/ghc.info | 8 | ||||
-rw-r--r-- | development/ghc/slack-desc | 14 |
5 files changed, 34 insertions, 48 deletions
diff --git a/development/ghc/README b/development/ghc/README index 9765fd2b85..791b096f2c 100644 --- a/development/ghc/README +++ b/development/ghc/README @@ -1,9 +1,5 @@ ghc (The Glasgow Haskell Compiler) -GHC is a state-of-the-art, open source, compiler and interactive -environment for the functional language Haskell. -This is a complete build, including interactive system, profiling -libraries and documentation. -This is packaged from a generic i386 linux binary distribution. - -This requires libedit from SlackBuilds.org. +GHC is a state-of-the-art, open source, compiler and interactive environment +for the functional language Haskell. This is a complete build, including +interactive system and profiling libraries and documentation. diff --git a/development/ghc/docs_ext-core_Makefile.patch b/development/ghc/docs_ext-core_Makefile.patch deleted file mode 100644 index d1e558f438..0000000000 --- a/development/ghc/docs_ext-core_Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- docs/ext-core/Makefile~ 2008-11-24 17:42:37.000000000 +0200 -+++ docs/ext-core/Makefile 2008-11-24 17:43:09.000000000 +0200 -@@ -5,8 +5,8 @@ - all: pdf - - install-docs: -- -mkdir $(docdir)/ext-core -- cp core.pdf $(docdir)/ext-core/ -+ -mkdir $(DESTDIR)/$(docdir)/ext-core -+ cp core.pdf $(DESTDIR)/$(docdir)/ext-core/ - else - all: - install-docs: diff --git a/development/ghc/ghc.SlackBuild b/development/ghc/ghc.SlackBuild index 2aba3baa2c..6238dc6cb2 100644 --- a/development/ghc/ghc.SlackBuild +++ b/development/ghc/ghc.SlackBuild @@ -6,8 +6,8 @@ # Public domain. PRGNAM=ghc -VERSION=${VERSION:-6.10.1} -ARCH=${ARCH:-i386} +VERSION=${VERSION:-6.12.1} +ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -16,12 +16,20 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then +TARARCH=i386 +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$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" + TARARCH="x86_64" fi set -e @@ -30,7 +38,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION-$ARCH-unknown-linux.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION-$TARARCH-unknown-linux-n.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -42,10 +50,10 @@ find . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=/usr - -# docs/ext-core/Makefile is missing DESTDIR -patch -p0 < $CWD/docs_ext-core_Makefile.patch + --prefix=/usr \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --libdir=/usr/lib${LIBDIRSUFFIX} make install DESTDIR=$PKG @@ -53,26 +61,19 @@ make install DESTDIR=$PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null || true find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ - xargs strip --strip-unneeded 2> /dev/null + xargs strip --strip-unneeded 2> /dev/null || true ) -# Fix paths -mv $PKG/usr/share/man $PKG/usr/man -mv $PKG/usr/share/doc $PKG/usr/doc -mv $PKG/usr/doc/ghc $PKG/usr/doc/ghc-$VERSION -( cd $PKG/usr/doc ; ln -s ghc-$VERSION ghc ) -rmdir $PKG/usr/share 2>/dev/null # Should be empty now - ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done ) -cp -a ANNOUNCE INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a INSTALL LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/development/ghc/ghc.info b/development/ghc/ghc.info index c11431f58e..3326510014 100644 --- a/development/ghc/ghc.info +++ b/development/ghc/ghc.info @@ -1,8 +1,10 @@ PRGNAM="ghc" -VERSION="6.10.1" +VERSION="6.12.1" HOMEPAGE="http://haskell.org/ghc/" -DOWNLOAD="http://haskell.org/ghc/dist/6.10.1/ghc-6.10.1-i386-unknown-linux.tar.bz2" -MD5SUM="1895a81c7788604579b5bbd01a566303" +DOWNLOAD="http://www.haskell.org/ghc/dist/6.12.1/ghc-6.12.1-i386-unknown-linux-n.tar.bz2" +DOWNLOAD_x86_64="http://www.haskell.org/ghc/dist/6.12.1/ghc-6.12.1-x86_64-unknown-linux-n.tar.bz2" +MD5SUM="4beedf446bcd18e1a61177378f2f6b0c" +MD5SUM_x86_64="d86705cd8abd62b02ee768202713f642" MAINTAINER="Mikko Varri" EMAIL="vmj@linuxbox.fi" APPROVED="rworkman" diff --git a/development/ghc/slack-desc b/development/ghc/slack-desc index 9d7682a947..a1743f135e 100644 --- a/development/ghc/slack-desc +++ b/development/ghc/slack-desc @@ -5,15 +5,15 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler----------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| ghc: ghc (The Glasgow Haskell Compiler) -ghc: +ghc: ghc: GHC is a state-of-the-art, open source, compiler and interactive ghc: environment for the functional language Haskell. ghc: This is a complete build, including interactive system, profiling ghc: libraries and documentation. -ghc: -ghc: This is packaged from a generic i386 linux binary distribution. -ghc: -ghc: http://haskell.org/ghc/ -ghc: +ghc: +ghc: Homepage: http://haskell.org/ghc/ +ghc: +ghc: +ghc: |