Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > f194a318933ccb99e88f3b507d07bcaa > files > 5

rrdtool-1.3.3-1mdv2009.0.src.rpm

diff -Naurp rrdtool-1.2.27/bindings/perl-shared/Makefile.PL rrdtool-1.2.27.oden/bindings/perl-shared/Makefile.PL
--- rrdtool-1.2.27/bindings/perl-shared/Makefile.PL	2008-02-17 11:26:32.000000000 +0100
+++ rrdtool-1.2.27.oden/bindings/perl-shared/Makefile.PL	2008-05-04 12:59:25.000000000 +0200
@@ -3,26 +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"};
-                /aix/     && do{ $R = "-Wl,-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 = "-L../../src/.libs/ $R -lrrd";
 
 WriteMakefile(
diff -Naurp rrdtool-1.2.27/bindings/ruby/extconf.rb rrdtool-1.2.27.oden/bindings/ruby/extconf.rb
--- rrdtool-1.2.27/bindings/ruby/extconf.rb	2008-02-17 11:26:32.000000000 +0100
+++ rrdtool-1.2.27.oden/bindings/ruby/extconf.rb	2008-05-04 12:59:34.000000000 +0200
@@ -3,9 +3,7 @@
 
 require 'mkmf'
 
-if /linux/ =~ RUBY_PLATFORM
-   $LDFLAGS += '-Wl,--rpath -Wl,$(EPREFIX)/lib'
-elsif /solaris/ =~ RUBY_PLATFORM
+if /solaris/ =~ RUBY_PLATFORM
    $LDFLAGS += '-R$(EPREFIX)/lib'
 elsif /hpux/ =~ RUBY_PLATFORM
    $LDFLAGS += '+b$(EPREFIX)/lib'