Subversion Repositories DevTools

Rev

Rev 315 | Rev 325 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 315 Rev 317
Line 834... Line 834...
834 
            unless ( PlatformConfig::checkBuildAvailability( $base_target ) );
 834 
            unless ( PlatformConfig::checkBuildAvailability( $base_target ) );
835 
    }
 835 
    }
836 
 
 836 
 
837 
    unless ($pInfo->{NOT_AVAILABLE} )
 837 
    unless ($pInfo->{NOT_AVAILABLE} )
838 
    {
 838 
    {
- 
 
 839 
        my $target_cfg = $pInfo->{TARGET_CFG} || $target ;
839 
        if ( my $build_cfg = Require( "$::GBE_CONFIG/PLATFORM", "${target}.cfg"  ) )
 840 
        if ( my $build_cfg = Require( "$::GBE_CONFIG/PLATFORM", "${target_cfg}.cfg"  ) )
840 
        {
 841 
        {
841 
            Verbose ("Processing(add) Platform Configuration file: $build_cfg");
 842 
            Verbose ("Processing(add) Platform Configuration file: $build_cfg");
842 
            my $package_name = "${target}_Build";
 843 
            my $package_name = "${target_cfg}_Build";
843 
 
 844 
 
844 
            if ( $package_name->can('add_platform') )
 845 
            if ( $package_name->can('add_platform') )
845 
            {
 846 
            {
846 
                Verbose ("Processing(add) Platform Configuration: $package_name");
 847 
                Verbose ("Processing(add) Platform Configuration: $package_name");
847 
                $package_name->add_platform( $pInfo );
 848 
                $package_name->add_platform( $pInfo );
Line 920... Line 921...
920 
    #   Create a simple alias if requested
 921 
    #   Create a simple alias if requested
921 
    #   Used if a platform creates multiple entires
 922 
    #   Used if a platform creates multiple entires
922 
    #
 923 
    #
923 
    if ( $pInfo->{ALIAS} )
 924 
    if ( $pInfo->{ALIAS} )
924 
    {
 925 
    {
925 
        HashJoin( \%BUILDALIAS_DELAY, ' ', $pInfo->{ALIAS}, $platform );
 926 
        HashJoin( \%BUILDALIAS_DELAY, ' ', $_, $platform )
- 
 
 927 
            foreach ( ArrayList($pInfo->{ALIAS}) );
926 
    }
 928 
    }
927 
 
 929 
 
928 
    #
 930 
    #
929 
    #   Create a HARDWARE type alias if requested
 931 
    #   Create a HARDWARE type alias if requested
930 
    #   ie: SOLARIS_SPARC or SOLARIS_X86
 932 
    #   ie: SOLARIS_SPARC or SOLARIS_X86
Line 3801... Line 3803...
3801 
    {
 3803 
    {
3802 
            push @paths, AbsPath("$BUILDINTERFACE/lib/$_");
 3804 
            push @paths, AbsPath("$BUILDINTERFACE/lib/$_");
3803 
    }
 3805 
    }
3804 
 
 3806 
 
3805 
    #
 3807 
    #
3806 
    #   $so may be a scalar of an array
 - 
 
3807 
    #   Convert scalar to an array
 - 
 
3808 
    #
 - 
 
3809 
    my @solist = (ref($so) eq 'ARRAY') ? @$so : $so;
 - 
 
3810 
 
 - 
 
3811 
    #
 - 
 
3812 
    #   For each LinkPkgArchive
 3808 
    #   For each LinkPkgArchive
3813 
    #
 3809 
    #
3814 
    foreach my $package ( @{$PKGRULES{$platform}} )
 3810 
    foreach my $package ( @{$PKGRULES{$platform}} )
3815 
    {
 3811 
    {
3816 
        next unless ( $package->{'type'} eq 'link' );
 3812 
        next unless ( $package->{'type'} eq 'link' );
3817 
 
 3813 
 
3818 
        my $base = $package->{'base'};
 3814 
        my $base = $package->{'base'};
3819 
        for my $path ( @{$package->{'PLIBDIRS'}} )
 3815 
        for my $path ( @{$package->{'PLIBDIRS'}} )
3820 
        {
 3816 
        {
3821 
            my @so_libs;
 3817 
            my @so_libs;
3822 
            push @so_libs, glob ( "$base$path/*$_") foreach ( @solist );
 3818 
            push @so_libs, glob ( "$base$path/*$_") foreach ( ArrayList($so) );
3823 
            next unless scalar @so_libs;
 3819 
            next unless scalar @so_libs;
3824 
            push @paths, $base . $path;;
 3820 
            push @paths, $base . $path;;
3825 
        }
 3821 
        }
3826 
    }
 3822 
    }
3827 
 
 3823