summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2012-07-09 10:52:26 +0000
committerespie <espie@openbsd.org>2012-07-09 10:52:26 +0000
commitec47798d0b5fa2f2fda9a5b80a494b21f496300f (patch)
tree9c8b7160102b90ba8b06687c1e76e02af2c30a6e
parentwhen being asked which disk to install on, give the user the chance to (diff)
downloadwireguard-openbsd-ec47798d0b5fa2f2fda9a5b80a494b21f496300f.tar.xz
wireguard-openbsd-ec47798d0b5fa2f2fda9a5b80a494b21f496300f.zip
implement help-all
-rw-r--r--usr.bin/libtool/LT/Mode/Compile.pm13
-rw-r--r--usr.bin/libtool/LT/Mode/Install.pm11
-rw-r--r--usr.bin/libtool/LT/Mode/Link.pm10
-rwxr-xr-xusr.bin/libtool/libtool42
4 files changed, 71 insertions, 5 deletions
diff --git a/usr.bin/libtool/LT/Mode/Compile.pm b/usr.bin/libtool/LT/Mode/Compile.pm
index e1231fcbcca..707703b5ce8 100644
--- a/usr.bin/libtool/LT/Mode/Compile.pm
+++ b/usr.bin/libtool/LT/Mode/Compile.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Compile.pm,v 1.4 2012/07/09 10:34:52 espie Exp $
+# $OpenBSD: Compile.pm,v 1.5 2012/07/09 10:52:26 espie Exp $
#
# Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
# Copyright (c) 2012 Marc Espie <espie@openbsd.org>
@@ -26,6 +26,17 @@ use LT::LoFile;
use LT::Util;
use LT::Trace;
+sub help
+{
+ print <<"EOH";
+
+Usage: $0 --mode=compile COMPILE-COMMAND [opts] SOURCE
+Compile source file into library object
+
+ -o OUTPUT-FILE
+EOH
+}
+
my @valid_src = qw(asm c cc cpp cxx f s);
sub run
{
diff --git a/usr.bin/libtool/LT/Mode/Install.pm b/usr.bin/libtool/LT/Mode/Install.pm
index 2e7d1827ef8..e98cd251686 100644
--- a/usr.bin/libtool/LT/Mode/Install.pm
+++ b/usr.bin/libtool/LT/Mode/Install.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Install.pm,v 1.4 2012/07/09 10:34:52 espie Exp $
+# $OpenBSD: Install.pm,v 1.5 2012/07/09 10:52:26 espie Exp $
#
# Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
# Copyright (c) 2012 Marc Espie <espie@openbsd.org>
@@ -26,6 +26,15 @@ use LT::Trace;
use Getopt::Std;
use File::Basename;
+sub help
+{
+ print <<"EOH";
+
+Usage: $0 --mode=install [cp|install] [parameters] source dest
+Install executables/libraries.
+EOH
+}
+
sub run
{
my ($class, $ltprog) = @_;
diff --git a/usr.bin/libtool/LT/Mode/Link.pm b/usr.bin/libtool/LT/Mode/Link.pm
index 6cd9e8eb163..dab82c29bf9 100644
--- a/usr.bin/libtool/LT/Mode/Link.pm
+++ b/usr.bin/libtool/LT/Mode/Link.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Link.pm,v 1.4 2012/07/09 10:34:52 espie Exp $
+# $OpenBSD: Link.pm,v 1.5 2012/07/09 10:52:26 espie Exp $
#
# Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
# Copyright (c) 2012 Marc Espie <espie@openbsd.org>
@@ -33,6 +33,14 @@ use constant {
PROGRAM => 2,
};
+sub help
+{
+ print <<"EOH";
+
+Usage: $0 --mode=link LINK-COMMAND ...
+Link object files and libraries into a library or a program
+EOH
+}
our %opts;
my $shared = 0;
diff --git a/usr.bin/libtool/libtool b/usr.bin/libtool/libtool
index a6ad1e196a5..7db0fb82092 100755
--- a/usr.bin/libtool/libtool
+++ b/usr.bin/libtool/libtool
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $OpenBSD: libtool,v 1.26 2012/07/09 10:34:52 espie Exp $
+# $OpenBSD: libtool,v 1.27 2012/07/09 10:52:26 espie Exp $
# Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
# Copyright (c) 2012 Marc Espie <espie@openbsd.org>
@@ -106,7 +106,7 @@ sub help
sub help_all
{
- for my $class (values %$mode_maker) {
+ for my $class (sort values %$mode_maker) {
# XXX autoload *if needed*.
eval "require $class; ";
$class->help;
@@ -122,6 +122,16 @@ sub run
package LT::Mode::Clean;
our @ISA = qw(LT::Mode::Empty);
+sub help
+{
+ print <<"EOH";
+
+Usage: $0 --mode=clean RM [RM-Option]... FILE...
+has not been implemented.
+It should remove files from the build directory.
+EOH
+}
+
package LT::Mode::Execute;
our @ISA = qw(LT::Mode);
sub run
@@ -132,11 +142,39 @@ sub run
LT::Exec->execute(@$ltprog, @main::ARGV);
}
+sub help
+{
+ print <<"EOH";
+
+Usage: $0 --mode=execute COMMAND [ARGS...]
+Run a program after setting correct library path.
+EOH
+}
+
+
package LT::Mode::Finish;
our @ISA = qw(LT::Mode::Empty);
+sub help
+{
+ print <<"EOH";
+
+Usage: $0 --mode=finish [LIBDIR}...
+Complete the installation of libtool libraries.
+Not needed for our usage.
+EOH
+}
package LT::Mode::Uninstall;
our @ISA = qw(LT::Mode::Empty);
+sub help
+{
+ print <<"EOH";
+
+Usage: $0 --mode=uninstall RM [RM-OPTION]... FILE...
+has not been implemented
+It should remove libraries from an installation directory.
+EOH
+}
package LT::Options;
use Getopt::Long;