diff options
Diffstat (limited to 'source/l/hunspell')
-rwxr-xr-x | source/l/hunspell/hunspell.SlackBuild | 26 | ||||
-rw-r--r-- | source/l/hunspell/slack-desc | 6 |
2 files changed, 21 insertions, 11 deletions
diff --git a/source/l/hunspell/hunspell.SlackBuild b/source/l/hunspell/hunspell.SlackBuild index 78ca6fef8..93bb2895b 100755 --- a/source/l/hunspell/hunspell.SlackBuild +++ b/source/l/hunspell/hunspell.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=hunspell -VERSION=${VERSION:-1.2.9} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -35,12 +35,14 @@ rm -rf $PKG mkdir -p $TMP $PKG # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -53,11 +55,19 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 @@ -83,7 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --with-ui \ --with-readline \ - --build=$ARCH-slackware-linux \ + --build=$TARGET make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/hunspell/slack-desc b/source/l/hunspell/slack-desc index b3a4761b6..eb8f24401 100644 --- a/source/l/hunspell/slack-desc +++ b/source/l/hunspell/slack-desc @@ -11,9 +11,9 @@ hunspell: hunspell: Hunspell is a spell checker and morphological analyzer library hunspell: and program designed for languages with rich morphology hunspell: and complex word compounding or character encoding. -hunspell: Hunspell interfaces: Ispell-like terminal interface using Curses -hunspell: library, Ispell pipe interface, OpenOffice.org UNO module. -hunspell: +hunspell: Hunspell interfaces: Ispell-like terminal interface using ncurses +hunspell: library, Ispell pipe interface, and OpenOffice.org UNO module. hunspell: hunspell: Home page: http://hunspell.sourceforge.net/ hunspell: +hunspell: |