[perl-ExtUtils-Depends] Fixups: 5.6 compat, move "deps" comment.
- From: Ed J <edj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [perl-ExtUtils-Depends] Fixups: 5.6 compat, move "deps" comment.
- Date: Mon, 4 Aug 2014 13:32:45 +0000 (UTC)
commit 234856cbcc0a5f8b86e88d25d7dbd210fe207174
Author: Ed J <mohawk2 users noreply github com>
Date: Mon Aug 4 14:16:37 2014 +0100
Fixups: 5.6 compat, move "deps" comment.
lib/ExtUtils/Depends.pm | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/lib/ExtUtils/Depends.pm b/lib/ExtUtils/Depends.pm
index ed7e972..f2bdc2d 100644
--- a/lib/ExtUtils/Depends.pm
+++ b/lib/ExtUtils/Depends.pm
@@ -200,18 +200,20 @@ sub load {
my (@typemaps, $inc, $libs, @deps);
+ # this will not exist when loading files from old versions
+ # of ExtUtils::Depends.
@deps = eval { $depinstallfiles->deps };
@deps = @{"$depinstallfiles\::deps"}
if $@ and exists ${"$depinstallfiles\::"}{deps};
my $inline = eval { $depinstallfiles->Inline('C') };
if (!$@) {
- $inc = $inline->{INC} // '';
- $libs = $inline->{LIBS} // '';
+ $inc = $inline->{INC} || '';
+ $libs = $inline->{LIBS} || '';
@typemaps = @{ $inline->{TYPEMAPS} || [] };
} else {
- $inc = ${"$depinstallfiles\::inc"} // '';
- $libs = ${"$depinstallfiles\::libs"} // '';
+ $inc = ${"$depinstallfiles\::inc"} || '';
+ $libs = ${"$depinstallfiles\::libs"} || '';
@typemaps = @{"$depinstallfiles\::typemaps"};
}
@typemaps = map { File::Spec->rel2abs ($_, $instpath) } @typemaps;
@@ -221,9 +223,7 @@ sub load {
typemaps => \ typemaps,
inc => "-I$instpath $inc",
libs => $libs,
- # this will not exist when loading files from old versions
- # of ExtUtils::Depends.
- deps => \ deps,
+ deps => \ deps,
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]