summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/rrdtool/rrdtool.SlackBuild9
-rw-r--r--libraries/rrdtool/rrdtool.info2
-rw-r--r--libraries/rrdtool/slack-desc6
3 files changed, 12 insertions, 5 deletions
diff --git a/libraries/rrdtool/rrdtool.SlackBuild b/libraries/rrdtool/rrdtool.SlackBuild
index 012a10e201..d48c5bd747 100644
--- a/libraries/rrdtool/rrdtool.SlackBuild
+++ b/libraries/rrdtool/rrdtool.SlackBuild
@@ -13,6 +13,8 @@ VERSION=1.2.19
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PYTHON=$( python -c 'import sys; print sys.version[:3]' )
+PERL=$( eval "`perl -V:version`"; echo $version )
CWD=`pwd`
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -34,13 +36,14 @@ chown -R root:root .
chmod -R a-s,u+w,go+r-w .
# The python library is not added by default in the linking stage
-sed -i -r 's/^(LIBS = .*)/\0 -lpython2.4/' bindings/python/Makefile.in
+sed -i -r "s/^(LIBS = .*)/\0 -lpython${PYTHON}/" bindings/python/Makefile.in
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
RRDDOCDIR=/usr/doc/$PRGNAM-$VERSION \
./configure \
--prefix=/usr \
+ --disable-static \
--enable-perl-site-install
make
@@ -72,8 +75,8 @@ make install DESTDIR=$PKG
)
# And remove the directory leftovers
-rm -rf $PKG/usr/lib/perl5/5.8.8
-rm -rf $PKG/usr/lib/perl5/site_perl/5.8.8/i486-linux/auto/RRDp
+rm -rf $PKG/usr/lib/perl5/${PERL}
+rm -rf $PKG/usr/lib/perl5/site_perl/${PERL}/i486-linux/auto/RRDp
# Set correct permissions (mostly on the Perl bindings)
( cd $PKG
diff --git a/libraries/rrdtool/rrdtool.info b/libraries/rrdtool/rrdtool.info
index 76c0d4e02a..69bbb1eedb 100644
--- a/libraries/rrdtool/rrdtool.info
+++ b/libraries/rrdtool/rrdtool.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.2.19.tar.gz"
MD5SUM="df625d12e0585042a398ff946e32e3e7"
MAINTAINER="Michael Johnson"
EMAIL="youngmug@animeneko.net"
-APPROVED="danieldk"
+APPROVED="danieldk,alien"
diff --git a/libraries/rrdtool/slack-desc b/libraries/rrdtool/slack-desc
index 8eb660e269..1b0b0199db 100644
--- a/libraries/rrdtool/slack-desc
+++ b/libraries/rrdtool/slack-desc
@@ -5,7 +5,7 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
-|-----handy-ruler------------------------------------------------------|
+ |-----handy-ruler------------------------------------------------------|
rrdtool: rrdtool (RRDTool Logging and Graphing)
rrdtool:
rrdtool: RRD is the acronym for Round Robin Database. It is a system to
@@ -13,3 +13,7 @@ rrdtool: store and display time-series data (i.e. network bandwidth,
rrdtool: machine-room temperature, server load average).
rrdtool:
rrdtool:
+rrdtool:
+rrdtool:
+rrdtool:
+rrdtool: