diff options
| author | Michiel van Wessem <michiel@slackbuilds.org> | 2011-03-30 16:40:03 +0100 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2011-03-30 22:52:26 -0500 |
| commit | 225f69327bfa81a67f00e6b6577bd83cef9e2fae (patch) | |
| tree | 0897394dc13ffe11b238e7d15b94258823b07221 /development/kdiff3/kdiff3.SlackBuild | |
| parent | aa4deace925e81a400393d2ec504adbdf89860d6 (diff) | |
| download | slackbuilds-225f69327bfa81a67f00e6b6577bd83cef9e2fae.tar.gz | |
development/kdiff3: Updated script and added docbook patch.
Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>
Diffstat (limited to 'development/kdiff3/kdiff3.SlackBuild')
| -rw-r--r-- | development/kdiff3/kdiff3.SlackBuild | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/development/kdiff3/kdiff3.SlackBuild b/development/kdiff3/kdiff3.SlackBuild index a1dd3a5481..f53d1f9c67 100644 --- a/development/kdiff3/kdiff3.SlackBuild +++ b/development/kdiff3/kdiff3.SlackBuild @@ -26,12 +26,10 @@ VERSION=${VERSION:-0.9.95} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -42,14 +40,14 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -57,7 +55,6 @@ fi set -e # Exit on most errors - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -71,6 +68,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Patch docbook.dtd's so this will compile properly +patch -p1 < $CWD/docbook.patch + mkdir build cd build cmake \ @@ -83,7 +83,7 @@ cd build make VERBOSE=1 make install VERBOSE=1 DESTDIR=$PKG -cd - +cd .. find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true |