diff options
| author |   Robby Workman | 2010-05-24 07:58:41 +0200 |
|---|---|---|
| committer | Robby Workman | 2010-05-24 23:10:23 +0200 |
| commit | 9f8925c55a8c595d0f580d8cb9faed72312055ef (patch) | |
| tree | 3c2180cfa62dc0ec3b2564de9e9fbc2e43e29eab /misc/stardict/stardict.SlackBuild | |
| parent | 0f781813c2d40147fd1a111fac6514694bf24ffc (diff) | |
| download | slackbuilds-9f8925c55a8c595d0f580d8cb9faed72312055ef.tar.gz | |
misc/stardict: Fixed build on 13.1 and misc cleanups.
Diffstat (limited to 'misc/stardict/stardict.SlackBuild')
| -rw-r--r-- | misc/stardict/stardict.SlackBuild | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/misc/stardict/stardict.SlackBuild b/misc/stardict/stardict.SlackBuild index c0b7496942..154a2cb184 100644 --- a/misc/stardict/stardict.SlackBuild +++ b/misc/stardict/stardict.SlackBuild @@ -24,10 +24,19 @@ PRGNAM=stardict VERSION=${VERSION:-3.0.1} -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -59,10 +71,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Uncomment string below to fix transparent icon tray. Patch from svn. # See http://www.stardict.org/forum/viewtopic.php?f=5&t=246 patch src/eggtrayicon.c -p1 < $CWD/patches/stardict-transparent.patch -patch -p1 < $CWD/patches/05_g++-4.3.dpatch + +# Incorporate some fixes for gcc44 into a deb patch for gcc43 +patch -p1 < $CWD/patches/fixup_build_on_gcc44.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -87,10 +100,7 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( 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 -) +find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING ChangeLog README TODO doc/FAQ doc/HACKING \ |