X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Makefile.PL;h=846e489b82688f75755b1c758e242488c6c03817;hb=b1a1df91b1e35312c5b2e18b7b780c6525b475be;hp=69b1bfeba7c9b3ef662c42f07d6c2b2037d4a9d0;hpb=efead5be174cb5cc84bc5a5517aa9a7ec3acee48;p=perl%2Fmodules%2FScalar-Vec-Util.git diff --git a/Makefile.PL b/Makefile.PL index 69b1bfe..846e489 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -4,38 +4,69 @@ use strict; use warnings; use ExtUtils::MakeMaker; -BEGIN { - eval { require Config }; - die 'OS unsupported' if $@; - Config->import(qw/%Config/); - eval { require File::Spec }; - die 'OS unsupported' if $@; -} +use Config; +use File::Spec; + +sub validate_exe { + my ($name) = @_; -# Inspired from Module::Install::Can -print "Checking for a valid C compiler in the PATH... "; -my @ccs = ($Config{cc}); -unshift @ccs, $ENV{CC} if $ENV{CC}; -my $cc; -CC: -for my $c (@ccs) { - for my $dir (split /$Config{path_sep}/, $ENV{PATH}) { - my $abs = File::Spec->catfile($dir, $c); - if (-x $abs or MM->maybe_command($abs)) { - $cc = $c; - last CC; + my (@candidates, @args); + if (File::Spec->file_name_is_absolute($name)) { + # No need to look for args if the name is absolute. + @candidates = $name; + } else { + (my $base, @args) = split ' ', $name; + @candidates = map File::Spec->catfile($_, $base), File::Spec->path; + } + + for my $path (@candidates) { + my $command = MM->maybe_command($path); + if (defined $command) { + $command .= " @args" if @args; + return $command; } } + + return; } -my @C; -if ($cc) { - push @C, 'Util.c'; - print $cc, "\n"; -} else { - print "none\n"; + +sub check_exe { + my ($desc, $arg_var, $config_var, $env_var) = @_; + + my $exe; + + for (@ARGV) { + if (/^\Q$arg_var\E=(.*)/) { + $exe = validate_exe($1); + last if defined $exe; + } + } + + if (defined $exe) { + print "Forcing the use of $exe as the $desc.\n"; + } else { + print "Checking for a valid $desc in the PATH... "; + $exe = validate_exe($Config{$config_var}); + # Only fall back to env if we cannot find the one used to build perl. + if (not defined $exe and defined $ENV{$env_var}) { + $exe = validate_exe($ENV{$env_var}); + } + if (defined $exe) { + print "$exe\n"; + } else { + print "none\n"; + } + } + + return $exe; } -my @DEFINES; +my $cc = check_exe('C compiler', 'CC', 'cc', 'CC'); + +my $ld; +if (defined $cc) { + $ld = check_exe('linker', 'LD', 'ld', 'LD'); +} sub is_little_endian { my $order = $Config{byteorder}; @@ -48,32 +79,64 @@ sub is_little_endian { return $order eq (join '', 1 .. $len); } -my $unit = { bits => 8, size => 1 }; -if (not is_little_endian()) { - print "Forcing unit size of 8 on non-little-endian systems.\n"; -} else { - print "Checking unit size in bits... "; - my $align = $Config{alignbytes} || 1; - my @bits = (8, 16, 32, 64); - for my $bits (@bits) { - my $size = $Config{"u${bits}size"}; - next unless $size; - $unit = { bits => $bits, size => $size } if $size && $size <= $align; - } - print $unit->{bits}, +my %PARAMS; +my @DEFINES; + +if (defined $cc and defined $ld) { + $PARAMS{C} = [ 'Util.c' ]; + $PARAMS{XS} = { 'Util.xs' => 'Util.c' }; + $PARAMS{CC} = $cc; + $PARAMS{LD} = $ld; + + my $unit = { bits => 8, size => 1 }; + if (not is_little_endian()) { + print "Forcing unit size of 8 on non-little-endian systems.\n"; + } else { + print "Checking unit size in bits... "; + my $align = $Config{alignbytes} || 1; + my @bits = (8, 16, 32, 64); + for my $bits (@bits) { + my $size = $Config{"u${bits}size"}; + next unless $size; + $unit = { bits => $bits, size => $size } if $size && $size <= $align; + } + print $unit->{bits}, " (actually $unit->{size} bytes for $align bytes alignment).\n"; -} + } -{ my $bits = $unit->{bits}; push @DEFINES, '-DBV_UNIT="' . ($Config{"u${bits}type"} || "U$bits") . '"'; push @DEFINES, "-DSVU_SIZE=$bits"; +} else { + $PARAMS{C} = [ ]; + $PARAMS{XS} = { }; + $PARAMS{OBJECT} = ''; } -@DEFINES = (DEFINE => join ' ', @DEFINES) if @DEFINES; +$PARAMS{DEFINE} = join ' ', @DEFINES if @DEFINES; my $dist = 'Scalar-Vec-Util'; +(my $name = $dist) =~ s{-}{::}g; + +(my $file = $dist) =~ s{-}{/}g; +$file = "lib/$file.pm"; + +my %PREREQ_PM = ( + 'Exporter' => 0, + 'Carp' => 0, + 'XSLoader' => 0, + 'base' => 0, +); + +my %BUILD_REQUIRES = ( + 'Config' => 0, + 'ExtUtils::MakeMaker' => 0, + 'File::Spec' => 0, + 'Test::More' => 0, + %PREREQ_PM, +); + my %META = ( configure_requires => { 'Config' => 0, @@ -81,13 +144,11 @@ my %META = ( 'File::Spec' => 0, }, build_requires => { - 'Config' => 0, - 'ExtUtils::MakeMaker' => 0, - 'Test::More' => 0, + %BUILD_REQUIRES, }, dynamic_config => 1, resources => { - bugtracker => "http://rt.cpan.org/NoAuth/ReportBug.html?Queue=$dist", + bugtracker => "http://rt.cpan.org/Dist/Display.html?Name=$dist", homepage => "http://search.cpan.org/dist/$dist/", license => 'http://dev.perl.org/licenses/', repository => "http://git.profvince.com/?p=perl%2Fmodules%2F$dist.git", @@ -95,29 +156,24 @@ my %META = ( ); WriteMakefile( - NAME => 'Scalar::Vec::Util', - AUTHOR => 'Vincent Pit ', - LICENSE => 'perl', - VERSION_FROM => 'lib/Scalar/Vec/Util.pm', - ABSTRACT_FROM => 'lib/Scalar/Vec/Util.pm', - PL_FILES => {}, - C => \@C, - @DEFINES, - PREREQ_PM => { - 'Exporter' => 0, - 'Carp' => 0, - 'XSLoader' => 0, - 'base' => 0, - }, - MIN_PERL_VERSION => 5.006, - META_MERGE => \%META, - dist => { - PREOP => 'pod2text lib/Scalar/Vec/Util.pm > $(DISTVNAME)/README', - COMPRESS => 'gzip -9f', SUFFIX => 'gz' - }, - clean => { - FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt" - }, + NAME => $name, + AUTHOR => 'Vincent Pit ', + LICENSE => 'perl', + VERSION_FROM => $file, + ABSTRACT_FROM => $file, + PL_FILES => {}, + BUILD_REQUIRES => \%BUILD_REQUIRES, + PREREQ_PM => \%PREREQ_PM, + MIN_PERL_VERSION => '5.006', + META_MERGE => \%META, + dist => { + PREOP => "pod2text -u $file > \$(DISTVNAME)/README", + COMPRESS => 'gzip -9f', SUFFIX => 'gz' + }, + clean => { + FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt*" + }, + %PARAMS, ); 1; @@ -126,7 +182,7 @@ package MY; sub postamble { my $cv = join ' -coverage ', 'cover', - qw/statement branch condition path subroutine time/; + qw; <