[RT #65955] handle LD_RUN_PATH ignores with -rpath in lddlflags

Only handled for FT2 for now

diff --git a/FT2/FT2.pm b/FT2/FT2.pm
index e0a107b07a741aea046dcc752f2e80320ad797fe..034ee905dd65882f959e806757f26d4158cd53f1 100644 (file)
--- a/FT2/FT2.pm
+++ b/FT2/FT2.pm
@@ -5,7 +5,7 @@ use vars qw($VERSION @ISA);
 @ISA = qw(Imager::Font);
 
 BEGIN {
-  $VERSION = "0.78";
+  $VERSION = "0.79";
 
   eval {
     require XSLoader;

diff --git a/FT2/Makefile.PL b/FT2/Makefile.PL
index ca34198a9a0fd87fa65ff31d9e7debd05014a0dc..badd386e1237ba547eb1ada8b1e6446f466ce314 100644 (file)
--- a/FT2/Makefile.PL
+++ b/FT2/Makefile.PL
@@ -37,7 +37,7 @@ else {
   $opts{TYPEMAPS} = [ Imager::ExtUtils->typemap ];
 
   # Imager required configure through use
-  my @Imager_req = ( Imager => "0.78" );
+  my @Imager_req = ( Imager => "0.82" );
   if ($MM_ver >= 6.46) {
     $opts{META_MERGE} =
       {
@@ -99,6 +99,8 @@ if ($probe_res) {
   $opts{LIBS} = $probe_res->{LIBS};
   $opts{DEFINE} = $probe_res->{DEFINE};
   $opts{INC} = "@inc";
+  $opts{LDDLFLAGS} = $probe_res->{LDDLFLAGS}
+    if $probe_res->{LDDLFLAGS};
 
   if ($MM_ver > 6.06) {
     $opts{AUTHOR} = 'Tony Cook <tony@imager.perl.org>';

diff --git a/lib/Imager/Probe.pm b/lib/Imager/Probe.pm
index dd8e8f65e09adf286532f964d3da62d53c12c569..e8db68e19eb7c8c95b984534405968d307702beb 100644 (file)
--- a/lib/Imager/Probe.pm
+++ b/lib/Imager/Probe.pm
@@ -245,6 +245,15 @@ sub _probe_test {
     print "Setting LD_RUN_PATH=$ld_run_path for $req->{name} probe\n"
       if $req->{verbose};
     $ENV{LD_RUN_PATH} = $ld_run_path;
+    if ($Config{lddlflags} =~ /([^ ]*-(?:rpath|R)[,=]?)([^ ]+)/
+       && -d $2) {
+      # hackety, hackety
+      # LD_RUN_PATH is ignored when there's already an -rpath option
+      # so provide one
+      my $prefix = $1;
+      $result->{LDDLFLAGS} = $Config{lddlflags} . " " .
+       join " ", map "$prefix$_", split $Config{path_sep}, $ld_run_path;
+    }
   }
   my $good =
     Devel::CheckLib::check_lib