X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=debian%2Fpatches%2Fno-rpath-for-perl;h=c945a0b8185953d773903468364edf878b35cb23;hb=8acead256653240714fc1c788e913e922ee9fd69;hp=ad53e6343cd953ed44ec8a11c9d494e5c61771ae;hpb=77bd6159687918e59dd3bc5ae7f7c337a8ed9277;p=pkg-rrdtool.git

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';