From 7b0f94fce7ce523d31619913dc5720f26dc1ee94 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 20 Dec 2008 14:53:45 +0100 Subject: [PATCH] debian/patches: Updated no-rpath-for-perl. The patch now applies to the latest version of rrdtool. --- debian/changelog | 3 ++- debian/patches/no-rpath-for-perl | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa6f600..2971986 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,13 +5,14 @@ rrdtool (1.3.5-1) unstable; urgency=low - Updated bts428778-floating-point-exception to apply to the latest version of rrdtool; use rrd_free2() instead of rrd_free() to not leak memory. + - Updated no-rpath-for-perl to apply to the latest version of rrdtool. - Removed bts493553-pango-utf-8 - included upstream. - Removed bts496847-error-handling - included upstream. - Removed bts498183-segfault-madvise - included upstream. - Removed bts499349-memleaks - included upstream. - Removed bts499350-data-corruption - included upstream. - -- Sebastian Harl Sat, 20 Dec 2008 14:43:13 +0100 + -- Sebastian Harl Sat, 20 Dec 2008 14:53:10 +0100 rrdtool (1.3.1-4) unstable; urgency=high diff --git a/debian/patches/no-rpath-for-perl b/debian/patches/no-rpath-for-perl index 98eb989..ad53e63 100644 --- a/debian/patches/no-rpath-for-perl +++ b/debian/patches/no-rpath-for-perl @@ -1,8 +1,7 @@ -Index: pkg-rrdtool/bindings/perl-shared/Makefile.PL -=================================================================== ---- pkg-rrdtool.orig/bindings/perl-shared/Makefile.PL 2008-02-10 15:31:58.000000000 +0100 -+++ pkg-rrdtool/bindings/perl-shared/Makefile.PL 2008-02-10 15:34:16.000000000 +0100 -@@ -3,26 +3,7 @@ +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. @@ -17,6 +16,7 @@ Index: pkg-rrdtool/bindings/perl-shared/Makefile.PL - /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"}; - } -} @@ -26,6 +26,6 @@ Index: pkg-rrdtool/bindings/perl-shared/Makefile.PL -# library after it is installed. This install_name gets transfered -# to the perl shared object. - - my $librrd = "-L../../src/.libs/ $R -lrrd"; - - WriteMakefile( + my $librrd; + if ($^O eq 'darwin'){ + $librrd = '-lrrd'; -- 2.30.2