In perl.git, the branch nicholas/bisect has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/3869332028d235238089f29b97753443cc0c6c1a?hp=3a066a5d218f01881561084d375c683407c02a3f>
- Log -----------------------------------------------------------------
commit 3869332028d235238089f29b97753443cc0c6c1a
Author: Nicholas Clark <n...@ccl4.org>
Date: Thu Jul 5 16:00:44 2012 +0200
bisect-runner.pl always needs to pass paths gleaned from gcc to Configure.
Commits fdbac266ba9ef2a6 and 599ee4f7809ae508 ensure that /usr/local/lib,
/lib and /usr/lib are searched on all platforms for shared libraries, and
that multiarch library locations gleaned from gcc are searched on x86_64.
However, on other Linux architectures it fails to pass the multiarch
locations to Configure. Version (just) prior to 5.14.0 do not contain the
logic to ask gcc, so they fail to build on multiarch setups.
This commit ensures that the correct library locations are available on
all platforms.
-----------------------------------------------------------------------
Summary of changes:
Porting/bisect-runner.pl | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl
index c720804..745a509 100755
--- a/Porting/bisect-runner.pl
+++ b/Porting/bisect-runner.pl
@@ -36,18 +36,22 @@ if ($^O eq 'linux') {
push @paths, $_;
}
}
+ push @paths, map {$_ . $linux64} qw(/usr/local/lib /lib /usr/lib)
+ if $linux64;
}
-push @paths, map {$_ . $linux64} qw(/usr/local/lib /lib /usr/lib);
-
my %defines =
(
usedevel => '',
optimize => '-g',
ld => 'cc',
- ($linux64 ? (libpth => \@paths) : ()),
+ (@paths ? (libpth => \@paths) : ()),
);
+# Needed for the 'ignore_versioned_solibs' emulation below.
+push @paths, qw(/usr/local/lib /lib /usr/lib)
+ unless $linux64;
+
unless(GetOptions(\%options,
'target=s', 'make=s', 'jobs|j=i', 'expect-pass=i',
'expect-fail' => sub { $options{'expect-pass'} = 0; },
--
Perl5 Master Repository
