tag 631096 + patch quit . On Sun, Jun 26, 2011 at 06:19:46PM +0100, Dominic Hargreaves wrote: > You won't be able to push to our main repository, but feel free to send > patches. I think the required changes are trivial and documented on the > bug already, however, so don't feel you have to. I'll probably make the > changes this evening. ---end quoted text---
-- أحمد المحمودي (Ahmed El-Mahmoudy) Digital design engineer GPG KeyID: 0xEDDDA1B7 GPG Fingerprint: 8206 A196 2084 7E6D 0DF8 B176 BC19 6A94 EDDD A1B7
commit d17ef1244d8f34b54d963e82adc386e76614db90
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmo...@sabily.org>
Date: Sun Jun 26 16:46:18 2011 +0000
Add multi-arch dirs (also remove /usr/X11R6/lib) to ld_run_path (Closes: #631096)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
index 6c955d7..bf0822f 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
@@ -54,7 +54,7 @@ sub _unix_os2_ext {
my($found) = 0;
# Debian-specific: don't use LD_RUN_PATH for standard dirs
- $ld_run_path_seen{$_}++ for qw(/lib /usr/lib /usr/X11R6/lib);
+ $ld_run_path_seen{$_}++ for @libpath;
foreach my $thislib (split ' ', $potential_libs) {
diff --git a/debian/patches/debian/ld_run_path.diff b/debian/patches/debian/ld_run_path.diff
index ed5d631..3bfd98f 100644
--- a/debian/patches/debian/ld_run_path.diff
+++ b/debian/patches/debian/ld_run_path.diff
@@ -17,7 +17,7 @@ index b807e97..6c955d7 100644
my($found) = 0;
+ # Debian-specific: don't use LD_RUN_PATH for standard dirs
-+ $ld_run_path_seen{$_}++ for qw(/lib /usr/lib /usr/X11R6/lib);
++ $ld_run_path_seen{$_}++ for @libpath;
+
foreach my $thislib (split ' ', $potential_libs) {
signature.asc
Description: Digital signature
