src/usr.bin/pkg-config/pkg-config - diff

Return to pkg-config CVS log

Up to [local] / src / usr.bin / pkg-config

version 1.69, 2011/07/08 18:57:41

version 1.70, 2011/11/17 11:37:16

Line 19

use strict;

use warnings;

use Config;

use Getopt::Long;

use File::Basename;

use File::stat;

Line 104

Line 105

'define-variable=s' => $variables,

);

# Unconditionally switch to static mode on static arches as --static

# may not have been passed explicitly, but we don't want to re-order

# and simplify the libs like we do for shared architectures.

{

my @static_archs = qw(m88k vax);

my $machine_arch = $Config{'ARCH'};

if (grep { $_ eq $machine_arch } @static_archs){

$mode{static} = 1;

}

# Initial value of printerr depends on the options...

if (!defined $mode{printerr}) {

if (defined $mode{libs}

Line 208

Line 220

}

my $dep_cfg_list = simplify_and_reverse($cfg_full_list);

my $dep_cfg_list = $cfg_full_list;

if (!$mode{static}){

$dep_cfg_list = simplify_and_reverse($cfg_full_list);

}

if ($mode{cflags} || $mode{libs} || $mode{variable}) {

push @vlist, do_cflags($dep_cfg_list) if $mode{cflags};