From 8acead256653240714fc1c788e913e922ee9fd69 Mon Sep 17 00:00:00 2001 From: Bernd Zeimetz Date: Tue, 24 Jan 2012 23:20:35 +0100 Subject: [PATCH] Refreshing patches, dropping bts625631-gcc4.5. --- .../bts428778-floating-point-exception | 2 +- debian/patches/bts530814-hurd | 18 +++---- debian/patches/bts625631-gcc4.5 | 10 ---- debian/patches/implicit-decl-fix | 2 +- debian/patches/no-rpath-for-perl | 49 +++++++++---------- debian/patches/no-rpath-for-ruby | 16 +++--- debian/patches/series | 1 - 7 files changed, 42 insertions(+), 56 deletions(-) delete mode 100644 debian/patches/bts625631-gcc4.5 diff --git a/debian/patches/bts428778-floating-point-exception b/debian/patches/bts428778-floating-point-exception index 613f1ea..9878ac3 100644 --- a/debian/patches/bts428778-floating-point-exception +++ b/debian/patches/bts428778-floating-point-exception @@ -1,7 +1,7 @@ diff a/src/rrd_create.c b/src/rrd_create.c --- a/src/rrd_create.c +++ b/src/rrd_create.c -@@ -740,6 +740,15 @@ int rrd_create_fn( +@@ -771,6 +771,15 @@ int rrd_create_fn( default: /* can not be zero because we don't know anything ... */ rrd->cdp_prep->scratch[CDP_val].u_val = DNAN; diff --git a/debian/patches/bts530814-hurd b/debian/patches/bts530814-hurd index 8e8941d..de4a0be 100644 --- a/debian/patches/bts530814-hurd +++ b/debian/patches/bts530814-hurd @@ -1,15 +1,15 @@ diff a/src/rrd_graph.c /src/rrd_graph.c --- a/src/rrd_graph.c +++ b/src/rrd_graph.c -@@ -3697,6 +3697,7 @@ - image_desc_t im; +@@ -3958,6 +3958,7 @@ rrd_info_t *rrd_graph_v( rrd_info_t *grinfo; + char *old_locale; rrd_graph_init(&im); + size_t graphfile_len; /* a dummy surface so that we can measure text sizes for placements */ - - rrd_graph_options(argc, argv, &im); -@@ -3713,7 +3714,9 @@ + old_locale = setlocale(LC_NUMERIC, NULL); + setlocale(LC_NUMERIC, "C"); +@@ -3975,7 +3976,9 @@ rrd_info_t *rrd_graph_v( return NULL; } @@ -20,7 +20,7 @@ diff a/src/rrd_graph.c /src/rrd_graph.c rrd_set_error("filename (including path) too long"); rrd_info_free(im.grinfo); im_free(&im); -@@ -3722,6 +3725,16 @@ +@@ -3984,6 +3987,16 @@ rrd_info_t *rrd_graph_v( strncpy(im.graphfile, argv[optind], MAXPATH - 1); im.graphfile[MAXPATH - 1] = '\0'; @@ -37,10 +37,9 @@ diff a/src/rrd_graph.c /src/rrd_graph.c if (strcmp(im.graphfile, "-") == 0) { im.graphfile[0] = '\0'; -diff a/src/rrd_graph.h b/src/rrd_graph.h --- a/src/rrd_graph.h +++ b/src/rrd_graph.h -@@ -196,7 +196,11 @@ +@@ -206,7 +206,11 @@ typedef struct image_desc_t { /* configuration of graph */ @@ -52,10 +51,9 @@ diff a/src/rrd_graph.h b/src/rrd_graph.h long xsize, ysize; /* graph area size in pixels */ struct gfx_color_t graph_col[__GRC_END__]; /* real colors for the graph */ text_prop_t text_prop[TEXT_PROP_LAST]; /* text properties */ -diff a/src/rrd_tool.c b/src/rrd_tool.c --- a/src/rrd_tool.c +++ b/src/rrd_tool.c -@@ -555,7 +555,11 @@ +@@ -576,7 +576,11 @@ int HandleInputLine( printf("ERROR: invalid parameter count for pwd\n"); return (1); } diff --git a/debian/patches/bts625631-gcc4.5 b/debian/patches/bts625631-gcc4.5 deleted file mode 100644 index 18f735f..0000000 --- a/debian/patches/bts625631-gcc4.5 +++ /dev/null @@ -1,10 +0,0 @@ -diff a/src/rrd_format.h b/src/rrd_format.h ---- a/src/rrd_format.h -+++ b/src/rrd_format.h -@@ -36,5 +36,5 @@ - #define RRD_VERSION "0004" - #define RRD_VERSION3 "0003" --#define FLOAT_COOKIE 8.642135E130 -+#define FLOAT_COOKIE ((double)8.642135E130) - - typedef union unival { diff --git a/debian/patches/implicit-decl-fix b/debian/patches/implicit-decl-fix index fc3d53b..4056580 100644 --- a/debian/patches/implicit-decl-fix +++ b/debian/patches/implicit-decl-fix @@ -1,7 +1,7 @@ diff a/src/rrd_tool.c b/src/rrd_tool.c --- a/src/rrd_tool.c +++ b/src/rrd_tool.c -@@ -12,6 +12,8 @@ +@@ -16,6 +16,8 @@ #endif #endif diff --git a/debian/patches/no-rpath-for-perl b/debian/patches/no-rpath-for-perl index ad53e63..c945a0b 100644 --- a/debian/patches/no-rpath-for-perl +++ b/debian/patches/no-rpath-for-perl @@ -1,31 +1,30 @@ 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 -@@ -3,27 +3,7 @@ use Config; - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. - --# 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 = "-Wl,-blibpath:$rp"}; +@@ -20,26 +20,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'){ +- # 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'; diff --git a/debian/patches/no-rpath-for-ruby b/debian/patches/no-rpath-for-ruby index 3d98ba7..3a72644 100644 --- a/debian/patches/no-rpath-for-ruby +++ b/debian/patches/no-rpath-for-ruby @@ -1,15 +1,15 @@ -Index: rrdtool/bindings/ruby/extconf.rb -=================================================================== ---- rrdtool.orig/bindings/ruby/extconf.rb 2008-02-10 14:43:00.000000000 +0100 -+++ rrdtool/bindings/ruby/extconf.rb 2008-02-10 14:43:08.000000000 +0100 -@@ -3,9 +3,7 @@ +--- 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' +- $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' + $LDFLAGS += ' -R$(EPREFIX)/lib' elsif /hpux/ =~ RUBY_PLATFORM - $LDFLAGS += '+b$(EPREFIX)/lib' + $LDFLAGS += ' +b$(EPREFIX)/lib' diff --git a/debian/patches/series b/debian/patches/series index 3e14c51..ab9438e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ no-rpath-for-perl implicit-decl-fix bts530814-hurd tcl-8.5 -bts625631-gcc4.5 -- 2.30.2