diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-05-21 02:02:50 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-24 16:10:22 -0500 |
| commit | 13c42483d3bffccc63e7b631ee078014224553e6 (patch) | |
| tree | 472d6e610716f0de20c76e356a433af9fefdcbad /desktop/icewm | |
| parent | 0919bd172c95ac597b31f8987fbf4f9613992e67 (diff) | |
desktop/icewm: Miscellaneous cleanups.
Note that the imlib package in -current is broken right now:
/usr/lib64/libImlib.so: undefined reference to `png_check_sig'
Rebuilding imlib makes icewm build fine, so if the imlib rebuild
doesn't make it into 13.1, we'll have to wait for it to appear in
/patches before this will work.
Diffstat (limited to 'desktop/icewm')
| -rw-r--r-- | desktop/icewm/icewm.SlackBuild | 16 | ||||
| -rw-r--r-- | desktop/icewm/slack-desc | 10 |
2 files changed, 19 insertions, 7 deletions
diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild index 971781421f32..243eb236528e 100644 --- a/desktop/icewm/icewm.SlackBuild +++ b/desktop/icewm/icewm.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for icewm -# Copyright 2006-2009 Robby Workman Northport, Alabama, USA +# Copyright 2006,2007,2008,2009,2010 Robby Workman Northport, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,10 +24,19 @@ PRGNAM=icewm VERSION=${VERSION:-1.2.37} -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-icewm @@ -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 diff --git a/desktop/icewm/slack-desc b/desktop/icewm/slack-desc index b8768581edce..8066e3473cff 100644 --- a/desktop/icewm/slack-desc +++ b/desktop/icewm/slack-desc @@ -12,8 +12,8 @@ icewm: IceWM is a window manager for the X Window System. The goal of icewm: IceWM is speed, simplicity, and not getting in the user's way. icewm: icewm: Homepage: http://www.icewm.org/ -icewm: -icewm: -icewm: -icewm: -icewm: +icewm: +icewm: +icewm: +icewm: +icewm: |