diff options
| author |   sthen <sthen@openbsd.org> | 2011-06-02 12:46:03 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2011-06-02 12:46:03 +0000 |
| commit | d26ff7456a79cd972d424c4d67811870a15731d4 (patch) | |
| tree | dd9a29d45f1e00aa29e7fd600ffb87bdd65f9eea | |
| parent | Small refactoring of atascsi and fix non-data ATA commands to not set (diff) | |
| download | wireguard-openbsd-d26ff7456a79cd972d424c4d67811870a15731d4.tar.xz wireguard-openbsd-d26ff7456a79cd972d424c4d67811870a15731d4.zip | |
Revert previous; changes linking order for pkg-config --libs, breaking X on VAX.
Found by matthieu@
| -rw-r--r-- | usr.bin/pkg-config/pkg-config | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/usr.bin/pkg-config/pkg-config b/usr.bin/pkg-config/pkg-config index d107b6d6408..aedf8d7fc4e 100644 --- a/usr.bin/pkg-config/pkg-config +++ b/usr.bin/pkg-config/pkg-config @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $OpenBSD: pkg-config,v 1.44 2011/05/25 12:16:34 jasper Exp $ +# $OpenBSD: pkg-config,v 1.45 2011/06/02 12:46:03 sthen Exp $ # $CSK: pkgconfig.pl,v 1.39 2006/11/27 16:26:20 ckuethe Exp $ # Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org> @@ -21,7 +21,6 @@ use strict; use warnings; use Getopt::Long; use File::Basename; -use Memoize; use OpenBSD::PkgConfig; my @PKGPATH = qw(/usr/lib/pkgconfig /usr/local/lib/pkgconfig /usr/X11R6/lib/pkgconfig); @@ -105,12 +104,6 @@ GetOptions( 'debug' => \$D, 'define-variable=s' => $variables, ); -# handle_config() is not a slow routine per se, but we spend -# a lot of time in it, so cache the return values. The most gain -# is from configure scripts/build commands which query several modules -# at the same time. -memoize('handle_config'); - # Initial value of printerr depends on the options... if (!defined $mode{printerr}) { if (defined $mode{libs} || defined $mode{cflags} |