diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-07-10 09:51:33 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-07-10 09:51:33 +0000 |
| commit | d15653d1ce4d3c5d5abff60a2f12a3994bbce29d (patch) | |
| tree | 75fc54ce232e944eca571e02c683215f2b1c4240 /usr.bin | |
| parent | 11da18ebf232b9c40ee63534b08ff718e54961df (diff) | |
more config, sort stuff for easier spotting
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/libtool/LT/Archive.pm | 3 | ||||
| -rwxr-xr-x | usr.bin/libtool/libtool | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/usr.bin/libtool/LT/Archive.pm b/usr.bin/libtool/LT/Archive.pm index c4ebb2d965f..64c8853235c 100644 --- a/usr.bin/libtool/LT/Archive.pm +++ b/usr.bin/libtool/LT/Archive.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Archive.pm,v 1.3 2012/07/06 11:30:41 espie Exp $ +# $OpenBSD: Archive.pm,v 1.4 2012/07/10 09:51:32 espie Exp $ # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org> # Copyright (c) 2012 Marc Espie <espie@openbsd.org> @@ -23,6 +23,7 @@ package LT::Archive; use LT::Trace; use LT::Exec; use LT::Util; +use File::Path; sub extract { diff --git a/usr.bin/libtool/libtool b/usr.bin/libtool/libtool index 423a54832bf..af09f6af22e 100755 --- a/usr.bin/libtool/libtool +++ b/usr.bin/libtool/libtool @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $OpenBSD: libtool,v 1.33 2012/07/09 23:13:29 espie Exp $ +# $OpenBSD: libtool,v 1.34 2012/07/10 09:51:32 espie Exp $ # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org> # Copyright (c) 2012 Marc Espie <espie@openbsd.org> @@ -21,7 +21,6 @@ use warnings; use feature qw(say switch state); use Cwd qw(getcwd); use File::Glob ':glob'; -use File::Path; use LT::Trace; use LT::Exec; @@ -51,13 +50,16 @@ sub new ltdir => $ltdir, version => $version, objdir => $ltdir, + build_old_libs => 'yes', pic_flags => join(' ', @picflags), }; ($self->{gnu_arch} = $self->{machine_arch}) =~ s/amd64/x86_64/; if (grep { $_ eq $self->{machine_arch} } qw(m88k vax)) { + $self->{build_libtool_libs} = 'yes'; $self->{noshared} = 1; } else { + $self->{build_libtool_libs} = 'no'; $self->{noshared} = 0; } @@ -67,8 +69,8 @@ sub new sub dump { my $self = shift; - while (my ($key, $value) = each(%$self)) { - print "$key=$value\n"; + for my $key (sort keys %$self) { + say "$key=$self->{$key}"; } } |