summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorSebastien Marie <semarie@cvs.openbsd.org>2019-09-28 06:25:58 +0000
committerSebastien Marie <semarie@cvs.openbsd.org>2019-09-28 06:25:58 +0000
commitcb343a417182cf39517f6867d1a98f5bf5275cfb (patch)
tree9c392be893bf2b1287909a0fb21a9fd33920ffd6 /usr.bin
parent276fc5b11cc109b09ece5937657b06d2bf150274 (diff)
ensure dependency_libs and libdir are defined after parsing .la file.
problem raised with librsvg which use libtool-rust, and our libtool just die if deplib_list is undef. tested in bulk by sthen@ and naddy@ "modern" perl practice/syntax suggested by espie@ makes sense sthen@ ok espie@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/libtool/LT/LaFile.pm14
1 files changed, 13 insertions, 1 deletions
diff --git a/usr.bin/libtool/LT/LaFile.pm b/usr.bin/libtool/LT/LaFile.pm
index bd29cc34493..6c930f24706 100644
--- a/usr.bin/libtool/LT/LaFile.pm
+++ b/usr.bin/libtool/LT/LaFile.pm
@@ -1,4 +1,4 @@
-# $OpenBSD: LaFile.pm,v 1.23 2014/09/05 10:36:39 espie Exp $
+# $OpenBSD: LaFile.pm,v 1.24 2019/09/28 06:25:57 semarie Exp $
# Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
# Copyright (c) 2012 Marc Espie <espie@openbsd.org>
@@ -188,4 +188,16 @@ sub install
}
}
+sub parse
+{
+ my ($class, $filename) = @_;
+
+ my $info = $class->SUPER::parse($filename);
+
+ $info->{deplib_list} //= LT::UList->new;
+ $info->{libdir} //= '';
+
+ return $info;
+}
+
1;