diff options
| author | root <root@rshg054.dnsready.net> | 2011-10-02 23:14:32 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-10-02 23:14:32 +0000 |
| commit | ad84169d66d20378d28533c216b73c9a6646d6d7 (patch) | |
| tree | 2746e102687e113dd81d632b51933b62ff458934 /community/collectd | |
| parent | 0f78806d775c4d46c649425fcb67964d53531db8 (diff) | |
Sun Oct 2 23:14:32 UTC 2011
Diffstat (limited to 'community/collectd')
| -rw-r--r-- | community/collectd/PKGBUILD | 27 | ||||
| -rw-r--r-- | community/collectd/libperl.patch | 30 |
2 files changed, 45 insertions, 12 deletions
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 668a9cec5..a0abac0c4 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49792 2011-06-21 05:03:51Z foutrelis $ +# $Id: PKGBUILD 56117 2011-10-02 02:52:22Z ebelanger $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.0.0 -pkgrel=6 +pkgrel=7 pkgdesc='Daemon which collects system performance statistics periodically' arch=('i686' 'x86_64') url='http://collectd.org/' @@ -41,24 +41,28 @@ makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'iptables' 'libmemcached' depends=('libtool') -source=("${url}files/$pkgname-$pkgver.tar.gz" +source=("${url}files/${pkgname}-${pkgver}.tar.gz" 'libnotify-0.7.patch' 'yajl-2.x.patch' + 'libperl.patch' 'rc.d') sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7' 'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337' 'd3854c39c9596b4f6dcf67a9eb8decea4d17120d' + 'b221352447b2d42cade4a65ced322bcff8a40366' '0f441718d5519cb043b1130e5a1d0379078adbcc') install=install build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - unset LDFLAGS # or libperl not found + patch -p1 -i ../libperl.patch + autoconf + + sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c patch -p1 -i ../libnotify-0.7.patch patch -p1 -i ../yajl-2.x.patch - sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c ./configure \ --prefix=/usr \ @@ -67,17 +71,16 @@ build() { --enable-static=no \ --with-python=/usr/bin/python2 - # avoid -Werror with gcc 4.6 - sed -i '/^AM_CFLAGS/s/ -Werror//' src/Makefile + sed -i 's/ -Werror//g' */Makefile* */*/Makefile* make all } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install - install -D -m 755 ../rc.d "$pkgdir/etc/rc.d/$pkgname" - install -D -m 644 contrib/collectd2html.pl "$pkgdir"/usr/share/collectd/collectd2html.pl + install -D -m 755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" + install -D -m 644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl } diff --git a/community/collectd/libperl.patch b/community/collectd/libperl.patch new file mode 100644 index 000000000..d6184f29d --- /dev/null +++ b/community/collectd/libperl.patch @@ -0,0 +1,30 @@ +diff -aur old/configure.in new/configure.in +--- old/configure.in 2011-09-29 20:38:56.725672831 +1000 ++++ new/configure.in 2011-09-29 20:39:07.975658829 +1000 +@@ -2810,11 +2810,13 @@ + then + SAVE_CFLAGS="$CFLAGS" + SAVE_LDFLAGS="$LDFLAGS" ++ SAVE_LIBS="$LIBS" + dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string) + PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts` + PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts` + CFLAGS="$CFLAGS $PERL_CFLAGS" + LDFLAGS="$LDFLAGS $PERL_LDFLAGS" ++ LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" + + AC_CACHE_CHECK([for libperl], + [c_cv_have_libperl], +@@ -2833,7 +2835,10 @@ + Nullsv); + ]]), + [c_cv_have_libperl="yes"], +- [c_cv_have_libperl="no"] ++ [ ++ c_cv_have_libperl="no" ++ LIBS="$SAVE_LIBS" ++ ] + ) + ) + +Only in new: configure.in.orig |