summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/rrdtool/rrdtool.SlackBuild17
-rw-r--r--libraries/rrdtool/rrdtool.info8
2 files changed, 16 insertions, 9 deletions
diff --git a/libraries/rrdtool/rrdtool.SlackBuild b/libraries/rrdtool/rrdtool.SlackBuild
index 317131322f..6752c01c2e 100644
--- a/libraries/rrdtool/rrdtool.SlackBuild
+++ b/libraries/rrdtool/rrdtool.SlackBuild
@@ -5,13 +5,12 @@
# Originally written by <youngmug@animeneko.net>
# Modified by the SlackBuilds.org team.
# Versions >= 1.4.2 maintained by Niels Horn <niels.horn@gmail.com>
-# revision date: 2009/12/08
+# revision date: 2010/03/31
-# Exit on most errors
set -e
PRGNAM=rrdtool
-VERSION=1.4.2
+VERSION=1.4.3
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -26,12 +25,19 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
+ ARCHQUADLET=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX=""
+ ARCHQUADLET=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+ ARCHQUADLET=""
+elif [ "$ARCH" = "arm" ]; then
+ SLKCFLAGS="-O2 -march=armv4t"
+ LIBDIRSUFFIX=""
+ ARCHQUADLET="-gnueabi"
fi
rm -rf $PKG
@@ -51,6 +57,7 @@ RRDDOCDIR=/usr/doc/$PRGNAM-$VERSION \
--mandir=/usr/man \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--disable-static \
+ --build=$ARCH-slackware-linux$ARCHQUADLET \
--with-perl-options='INSTALLDIRS=vendor'
make
@@ -63,9 +70,9 @@ make install DESTDIR=$PKG
( cd $PKG
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null
+ 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
)
( cd $PKG/usr/man
diff --git a/libraries/rrdtool/rrdtool.info b/libraries/rrdtool/rrdtool.info
index 138a6ccdfa..a5824370ce 100644
--- a/libraries/rrdtool/rrdtool.info
+++ b/libraries/rrdtool/rrdtool.info
@@ -1,10 +1,10 @@
PRGNAM="rrdtool"
-VERSION="1.4.2"
+VERSION="1.4.3"
HOMEPAGE="http://www.rrdtool.org/"
-DOWNLOAD="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.2.tar.gz"
+DOWNLOAD="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.3.tar.gz"
+MD5SUM="492cf946c72f85987238faa2c311b7bb"
DOWNLOAD_x86_64=""
-MD5SUM="9318d3b4016dd9dd9897f1eac7548032"
MD5SUM_x86_64=""
MAINTAINER="Niels Horn"
EMAIL="niels.horn@gmail.com"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"