diff options
| author |   jasper <jasper@openbsd.org> | 2011-06-07 18:42:30 +0000 |
|---|---|---|
| committer | jasper <jasper@openbsd.org> | 2011-06-07 18:42:30 +0000 |
| commit | b8242b92b51359b27d57fcb54b91ee3df73f0530 (patch) | |
| tree | 3ffc0d56813452d2682ab6ee9bd1a764d67e45ef | |
| parent | Make use of macobio_* methods to manage the i2s GPIOs, remove the customs (diff) | |
| download | wireguard-openbsd-b8242b92b51359b27d57fcb54b91ee3df73f0530.tar.xz wireguard-openbsd-b8242b92b51359b27d57fcb54b91ee3df73f0530.zip | |
revert 'rc' handling for now, as it breaks iaxclient.
the underlying issue will be dealt with soon.
discussed with and ok sthen@
| -rw-r--r-- | usr.bin/pkg-config/pkg-config | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/pkg-config/pkg-config b/usr.bin/pkg-config/pkg-config index a747ea58866..c2b721d9756 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.53 2011/06/07 12:22:46 jasper Exp $ +# $OpenBSD: pkg-config,v 1.54 2011/06/07 18:42:30 jasper Exp $ # $CSK: pkgconfig.pl,v 1.39 2006/11/27 16:26:20 ckuethe Exp $ # Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org> @@ -572,13 +572,14 @@ sub compare # is there a valid non-numeric suffix to deal with later? # accepter are (in order): a(lpha) < b(eta) < rc < ' '. # suffix[0] is the 'alpha' part, suffix[1] is the '1' part in 'alpha1'. - if ($a =~ s/(rc|beta|b|alpha|a)(\d+)$//) { + # XXX: add back 'rc'. + if ($a =~ s/(beta|b|alpha|a)(\d+)$//) { print STDERR "valid suffix $1$2 found in $a.\n" if $D; $suffix_a[0] = $1; $suffix_a[1] = $2; } - if ($b =~ s/(rc|beta|b|alpha|a)(\d+)$//) { + if ($b =~ s/(beta|b|alpha|a)(\d+)$//) { print STDERR "valid suffix $1$2 found in $b.\n" if $D; $suffix_b[0] = $1; $suffix_b[1] = $2; |