diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-08-26 09:03:52 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-08-26 09:03:52 +0000 |
| commit | 7c2bae621da0ee90e45e99bee7794c9435846ec7 (patch) | |
| tree | 46e779e0ba78fd69320712d0dcf38cc8136ece97 /usr.bin/pkg-config | |
| parent | f035950a45ae6ec2d027a5c22557377b16c194dd (diff) | |
Don't remove subpaths of /usr/include or /usr/lib from the output of
--cflags and --libs.
ok jasper@
Diffstat (limited to 'usr.bin/pkg-config')
| -rw-r--r-- | usr.bin/pkg-config/pkg-config | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/pkg-config/pkg-config b/usr.bin/pkg-config/pkg-config index 7a79c03aa29..6fdc05c4b88 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.89 2017/08/15 01:29:23 jasper Exp $ +# $OpenBSD: pkg-config,v 1.90 2017/08/26 09:03:51 jsg Exp $ # $CSK: pkgconfig.pl,v 1.39 2006/11/27 16:26:20 ckuethe Exp $ # Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org> @@ -477,7 +477,7 @@ sub do_cflags foreach my $pkg (@$list) { my $l = $configs{$pkg}->get_property('Cflags', $variables); foreach (@$l) { - unless ($_ =~ /-I\/usr\/include/) { + unless ($_ =~ /-I\/usr\/include\/*$/) { push(@$cflags, $_); } } @@ -513,14 +513,14 @@ sub do_libs foreach my $pkg (@$list) { my $l = $configs{$pkg}->get_property('Libs', $variables); foreach (@$l) { - unless ($_ =~ /-L\/usr\/lib/) { + unless ($_ =~ /-L\/usr\/lib\/*$/) { push(@$libs, $_); } } if ($mode{static}) { my $lp = $configs{$pkg}->get_property('Libs.private', $variables); foreach (@$lp) { - unless ($_ =~ /-L\/usr\/lib/) { + unless ($_ =~ /-L\/usr\/lib\/*/) { push(@$libs, $_); } } |