diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2016-08-09 16:05:02 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-08-13 07:22:19 +0700 |
| commit | e8ed9e82beb4746bc3927c5f4a592f15e7e1aa12 (patch) | |
| tree | 45b6fdee3aa13fbe085657fbc45c9aa2c4ee2251 /network/ntop/ntop.SlackBuild | |
| parent | a4fa72fc390d032934708cd702d811730890b872 (diff) | |
network/ntop: Fixed build with rrdtool-1.6.0.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'network/ntop/ntop.SlackBuild')
| -rw-r--r-- | network/ntop/ntop.SlackBuild | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/network/ntop/ntop.SlackBuild b/network/ntop/ntop.SlackBuild index 59f905536409..2e3de40b1651 100644 --- a/network/ntop/ntop.SlackBuild +++ b/network/ntop/ntop.SlackBuild @@ -35,7 +35,7 @@ NTOPGROUP=${NTOPGROUP:-ntop} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -59,8 +59,8 @@ elif ! grep ^$NTOPUSER: /etc/passwd 2>&1 > /dev/null; then exit 1 fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -91,10 +91,15 @@ find -L . \ # Patch Makefile so we won't do automatic downloads patch -p1 < $CWD/no_downloads.patch +# Patch for rrdtool-1.6.0 (thanks to Gentoo) +patch -p1 < $CWD/ntop-5.0.1-librrd.patch + # Since ntop calls their ./configure from autogen.sh anything passed onto # autogen.sh (ie $@) is passed off as command line arguments to configure. CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +RRD_LIB="-lrrd" \ +LOCALEDIR=/usr/lib${LIBDIRSUFFIX}/locale \ ./autogen.sh \ --prefix=/usr \ --sysconfdir=/etc \ @@ -102,6 +107,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --with-rrd-home=/usr/lib${LIBDIRSUFFIX} \ --enable-snmp \ --build=$ARCH-slackware-linux make |