X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=0c7edc090ed4f79a1c05d5d5a5e569f19c25fe05;hb=HEAD;hp=d160e01d5901a9d740cb54be5480a6331bbdddb3;hpb=18377f5b48c5ddfa2a6ca9e6ec7109e1e0ad50a0;p=p5sagit%2Fnamespace-clean.git diff --git a/Makefile.PL b/Makefile.PL index d160e01..0c7edc0 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -3,7 +3,7 @@ use warnings; use 5.008001; my %META = ( - name => 'namespace::clean', + name => 'namespace-clean', license => 'perl_5', abstract => 'Keep imports and functions out of your namespace', @@ -19,19 +19,17 @@ my %META = ( configure => { requires => { 'ExtUtils::MakeMaker' => 0, - 'ExtUtils::CBuilder' => 0.27, } }, runtime => { requires => { - 'Package::Stash' => '0.23', 'B::Hooks::EndOfScope' => '0.12', 'perl' => '5.008001', }, }, test => { requires => { - 'Test::More' => '0.88', + 'Test::More' => '0.47', } }, }, @@ -42,7 +40,7 @@ my %META = ( repository => { type => 'git', url => 'git://git.shadowcat.co.uk/p5sagit/namespace-clean.git', - web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/namespace-clean.git', + web => 'https://github.com/p5sagit/namespace-clean', }, bugtracker => { mailto => 'bug-namespace-clean@rt.cpan.org', @@ -53,19 +51,97 @@ my %META = ( my %MM_ARGS = ( ( # a sub-namer is needed if using the debugger on some perls - require 'lib/namespace/clean/_Util.pm' + do { + # sigh... so much unmitigated stupidity on #p5p these days... + local @INC = ('lib', @INC); + require namespace::clean::_Util; + } and namespace::clean::_Util::DEBUGGER_NEEDS_CV_RENAME() and namespace::clean::_Util::_namer_load_error() and - can_xs() + usable_compiler_present() ) # when changing version, also change $sn_ver in namespace/clean/_Util.pm ? ( PREREQ_PM => { 'Sub::Name' => '0.04' } ) : () ); +## XS-checking BOILERPLATE ################################################### +sub usable_compiler_present { + return 0 if parse_args()->{PUREPERL_ONLY}; + + my $ucp; + + local $@; + eval { + # poor man's inc::latest + my $euhc_fn = 'ExtUtils/HasCompiler.pm'; + my $euhc_found_in_INC_dir; + + ( ($euhc_found_in_INC_dir) = grep { + not length ref $_ + and + -f "$_/$euhc_fn" + and + -r "$_/$euhc_fn" + } @INC ) + and + ( + MM->parse_version("$euhc_found_in_INC_dir/$euhc_fn") + > + MM->parse_version("inc/$euhc_fn") + ) + and + eval { require ExtUtils::HasCompiler }; + + unless ( $INC{'ExtUtils/HasCompiler.pm'} ) { + local @INC = ( "inc", @INC ); + require ExtUtils::HasCompiler; + } + + $ucp = ExtUtils::HasCompiler::can_compile_loadable_object(quiet => 1) + ? 1 + : 0 + ; + + 1; + }; + + if( my $used_fn = $INC{'ExtUtils/HasCompiler.pm'} ) { + printf + "ExtUtils::HasCompiler::can_compile_loadable_object() v%s (loaded from %s) returned: %s\n", + ExtUtils::HasCompiler->VERSION, + $used_fn, + ( defined($ucp) ? $ucp : "UNKNOWN" ), + ; + } + else { + print "Something went wrong when trying to load/use ExtUtils::HasCompiler:\n$@\n\n"; + } + + $ucp; +} + + +# FIXME - this has been cargo-culted from +# https://metacpan.org/source/HAARG/strictures-2.000002/Makefile.PL +# There likely will be better ways to handle %ENV and @ARGV directly within +# EU::HC in the future +sub parse_args { + # copied from EUMM + require ExtUtils::MakeMaker; + require Text::ParseWords; + ExtUtils::MakeMaker::parse_args( + my $tmp = {}, + Text::ParseWords::shellwords($ENV{PERL_MM_OPT} || ''), + @ARGV, + ); + return $tmp->{ARGS} || {}; +} +## END XS-checking BOILERPLATE ############################################### + ## BOILERPLATE ############################################################### require ExtUtils::MakeMaker; @@ -108,106 +184,3 @@ delete $MM_ARGS{CONFIGURE_REQUIRES} ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS); ## END BOILERPLATE ########################################################### - - -# FIXME -# Need to replace with EU::HC, but too many changes for this release already -########################################### -# can we locate a (the) C compiler -sub can_cc { - my @chunks = split(/ /, $Config::Config{cc}) or return; - - # $Config{cc} may contain args; try to find out the program part - while (@chunks) { - return can_run("@chunks") || (pop(@chunks), next); - } - - return; -} - -# check if we can run some command -sub can_run { - my ($cmd) = @_; - - return $cmd if -x $cmd; - if (my $found_cmd = MM->maybe_command($cmd)) { - return $found_cmd; - } - - require File::Spec; - for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { - next if $dir eq ''; - my $abs = File::Spec->catfile($dir, $cmd); - return $abs if (-x $abs or $abs = MM->maybe_command($abs)); - } - - return; -} - -# Can our C compiler environment build XS files -sub can_xs { - # Do we have the configure_requires checker? - local $@; - eval "require ExtUtils::CBuilder; ExtUtils::CBuilder->VERSION(0.27)"; - if ( $@ ) { - # They don't obey configure_requires, so it is - # someone old and delicate. Try to avoid hurting - # them by falling back to an older simpler test. - return can_cc(); - } - - # Do we have a working C compiler - my $builder = ExtUtils::CBuilder->new( - quiet => 1, - ); - unless ( $builder->have_compiler ) { - # No working C compiler - return 0; - } - - # Write a C file representative of what XS becomes - require File::Temp; - my ( $FH, $tmpfile ) = File::Temp::tempfile( - "compilexs-XXXXX", - SUFFIX => '.c', - ); - binmode $FH; - print $FH <<'END_C'; -#include "EXTERN.h" -#include "perl.h" -#include "XSUB.h" - -int main(int argc, char **argv) { - return 0; -} - -int boot_sanexs() { - return 1; -} - -END_C - close $FH; - - # Can the C compiler access the same headers XS does - my @libs = (); - my $object = undef; - eval { - local $^W = 0; - $object = $builder->compile( - source => $tmpfile, - ); - @libs = $builder->link( - objects => $object, - module_name => 'sanexs', - ); - }; - my $result = $@ ? 0 : 1; - - # Clean up all the build files - foreach ( $tmpfile, $object, @libs ) { - next unless defined $_; - 1 while unlink; - } - - return $result; -}