On Tue, 2014-04-29 at 19:34 +0200, Tobias Oetiker wrote:
> Hi Svante,
>
> cool ... have you seen that there is now the beginning of a
> test-suite in the HEAD branch of on github ?
Hi Tobi,
I did run tests/alltest and tests/tune1,tune2. All tests were OK.
Anything else to try to find out if the patches are OK? Anything I can
apply with valgrind, the tests are all shell scripts. Of course set -x
etc, will work.
Attached are four Debian patches from the latest built version 1.4.8-1.
They apply to the latest git too. Maybe they are of interest to apply
upstream too?
Thanks,
Svante
diff a/src/rrd_tool.c b/src/rrd_tool.c
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -13,6 +13,8 @@
#include <fcntl.h>
#endif
+#include <unistd.h>
+
#include "rrd_tool.h"
#include "rrd_xport.h"
#include "rrd_i18n.h"
diff a/bindings/perl-shared/Makefile.PL b/bindings/perl-shared/Makefile.PL
--- a/bindings/perl-shared/Makefile.PL
+++ b/bindings/perl-shared/Makefile.PL
@@ -27,26 +27,7 @@ if (($Config{'osname'} eq 'MSWin32' && $
) : ()
);
}else{
- # if the last argument when calling Makefile.PL is RPATH=/... and ... is the
- # path to librrd.so then the Makefile will be written such that RRDs.so knows
- # where to find librrd.so later on ...
my $R="";
- if ($ARGV[-1] =~ /RPATH=(\S+)/){
- pop @ARGV;
- my $rp = $1;
- for ($^O){
- /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"};
- /hpux/ && do{ $R = "+b$rp"};
- /solaris/ && do{ $R = "-R$rp"};
- /bsd/ && do{ $R = "-R$rp"};
- /aix/ && do{ $R = "-blibpath:$rp"};
- }
- }
-
- # darwin works without this because librrd contains its
- # install_name which will includes the final location of the
- # library after it is installed. This install_name gets transfered
- # to the perl shared object.
my $librrd;
if ($^O eq 'darwin'){
$librrd = '-lrrd';
--- a/bindings/ruby/extconf.rb
+++ b/bindings/ruby/extconf.rb
@@ -3,9 +3,9 @@
require 'mkmf'
-if /linux/ =~ RUBY_PLATFORM
- $LDFLAGS += ' -Wl,--rpath -Wl,$(EPREFIX)/lib'
-elsif /solaris/ =~ RUBY_PLATFORM
+#if /linux/ =~ RUBY_PLATFORM
+# $LDFLAGS += ' -Wl,--rpath -Wl,$(EPREFIX)/lib'
+if /solaris/ =~ RUBY_PLATFORM
$LDFLAGS += ' -R$(EPREFIX)/lib'
elsif /hpux/ =~ RUBY_PLATFORM
$LDFLAGS += ' +b$(EPREFIX)/lib'
Index: rrdtool/bindings/python/setup.py
===================================================================
--- rrdtool.orig/bindings/python/setup.py 2008-02-09 22:23:06.000000000 +0100
+++ rrdtool/bindings/python/setup.py 2008-02-09 22:23:47.000000000 +0100
@@ -45,7 +45,7 @@
#packages = ['rrdtool'],
ext_modules = [
Extension(
- "rrdtoolmodule",
+ "rrdtool",
["rrdtoolmodule.c"],
libraries=['rrd'],
library_dirs=[library_dir],
_______________________________________________
rrd-developers mailing list
[email protected]
https://lists.oetiker.ch/cgi-bin/listinfo/rrd-developers
