Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

another fix for {...}[0]; we need extra_cflags/libs for installed libs

  • Loading branch information...
commit 915f5137a3e8ddcad747fbf4ea0c90fa981e4d52 1 parent e4849d3
@FROGGS FROGGS authored
Showing with 5 additions and 5 deletions.
  1. +2 −2 Build.PL
  2. +3 −3 inc/My/Builder/Unix.pm
View
4 Build.PL
@@ -175,7 +175,7 @@ else {
for my $p ( @$source_packs ) {
$rv = { title => $p->{title}, members => [], buildtype => 'build_from_sources' };
for my $m (@{ $p->{members} }) {
- next if $m->{pack} !~ /^SDL/ && $have_libs{ $m->{pack} };
+ next if $m->{pack} !~ /^SDL/ && $have_libs{ $m->{pack} }[0];
my $good = 1;
$good &= $have_libs{$_} && $have_libs{$_}[0] ? 1 : 0 for @{ $m->{prereqs}->{libs} };
if( $good ) {
@@ -200,7 +200,7 @@ else {
if( $c->{buildtype} eq 'use_config_script' ) {
$c->{title} .= "\n ";
for(qw(SDL SDL_image SDL_mixer SDL_ttf SDL_gfx SDL_Pango)) {
- $c->{title} .= "$_(v$have_libs{$_}->[0]) " if $have_libs{$_};
+ $c->{title} .= "$_(v$have_libs{$_}->[0]) " if $have_libs{$_}[0];
}
}
View
6 inc/My/Builder/Unix.pm
@@ -47,7 +47,7 @@ sub build_binaries {
my( $self, $build_out, $build_src ) = @_;
my $bp = $self->notes('build_params');
foreach my $pack (@{$bp->{members}}) {
- if($pack->{pack} =~ m/^png|ogg|vorbis|z$/ && check_prereqs_libs($pack->{pack})) {
+ if($pack->{pack} =~ m/^png|ogg|vorbis|z$/ && check_prereqs_libs($pack->{pack})->[0]) {
print "SKIPPING package '" . $pack->{dirname} . "' (already installed)...\n";
}
elsif($pack->{pack} =~ m/^(SDL_mixer)$/ && !$self->_is_gnu_make($self->_get_make)) {
@@ -120,8 +120,8 @@ sub _get_configure_cmd {
my ($self, $pack, $prefixdir) = @_;
my $extra = '';
my $escaped_prefixdir = $self->escape_path( $prefixdir );
- my $extra_cflags = "-I$escaped_prefixdir/include";
- my $extra_ldflags = "-L$escaped_prefixdir/lib";
+ my $extra_cflags = "-I$escaped_prefixdir/include" . $self->get_additional_cflags();
+ my $extra_ldflags = "-L$escaped_prefixdir/lib" . $self->get_additional_libs();
my $extra_PATH = "";
my $uname = $Config{archname};
my $stdout = '';
Please sign in to comment.
Something went wrong with that request. Please try again.