X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Makefile.PL;h=507fa0c95aa26967e1998407ffba68f457718e84;hb=refs%2Fheads%2Fmaster;hp=905fa9f73e9ca589849e414059632ac3fa35b7a1;hpb=832f6a4eae21bec85e1cb1043fbc41fcf59cbfcd;p=perl%2Fmodules%2FScope-Upper.git

diff --git a/Makefile.PL b/Makefile.PL
index 905fa9f..507fa0c 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,4 @@
-use 5.006001;
+use 5.006_001;
 
 use strict;
 use warnings;
@@ -6,6 +6,28 @@ use ExtUtils::MakeMaker;
 
 use Config;
 
+if ($Config{d_cplusplus}) {
+ print STDERR <<'FAILPLUSPLUS';
+Configuration aborted: C++ compilers are not supported
+
+    Your perl has been built with a C++ compiler, which is then handed to
+    XS extensions as if it were a proper C compiler. This extension is
+    written in C, and naturally only supports C compilers, so it cannot be
+    built with your perl.
+
+    Note that building perl with a C++ compiler is only supposed to be done
+    by core developers in order to check that the perl headers can be
+    included from C++ code. Its use in the wild is not supported by the
+    perl5 porters. If your vendor has built its perl binary with a C++
+    compiler, please consider reporting this issue to them.
+
+    This text will be displayed 10 seconds, and then the configuration
+    script will exit.
+FAILPLUSPLUS
+ sleep 10;
+ exit 0;
+}
+
 my $pl   = $Config{perl_patchlevel};
 my $desc = $Config{git_describe};
 for ($pl, $desc) {
@@ -35,14 +57,23 @@ if ($^O eq 'MSWin32' and not grep /^LD[A-Z]*=/, @ARGV) {
                   @Config{qw<bin sitebin>};
   $macro{LDDLFLAGS}    = "$lddlflags $libdirs $libperl";
   $macro{LDFLAGS}      = "$ldflags $libdirs $libperl";
-  $macro{PERL_ARCHIVE} = '',
+  eval <<'  MY_SECTION';
+   package MY;
+   sub dynamic_lib {
+    my $self = shift;
+    my $inherited = $self->SUPER::dynamic_lib(@_);
+    $inherited =~ s/"?\$\(PERL_ARCHIVE\)"?//g;
+    return $inherited;
+   }
+  MY_SECTION
+  die $@ if $@;
  }
 }
 print $is_gcc_34 ? "yes\n" : "no\n";
 
 # Threads, Windows and 5.8.x don't seem to be best friends
 if ($^O eq 'MSWin32' && "$]" < 5.009) {
- push @DEFINES, '-DSU_MULTIPLICITY=0';
+ push @DEFINES, '-DXSH_MULTIPLICITY=0';
 }
 
 @DEFINES = (DEFINE => join ' ', @DEFINES) if @DEFINES;
@@ -55,6 +86,14 @@ my $dist = 'Scope-Upper';
 (my $file = $dist) =~ s{-}{/}g;
 $file = "lib/$file.pm";
 
+my $bug_web    = "http://rt.cpan.org/Dist/Display.html?Name=$dist",
+my $bug_mailto = 'bug-' . lc($dist) . '@rt.cpan.org';
+
+my $repo_host = 'git.vpit.fr';
+my @repo_path = ('perl', 'modules', "$dist.git");
+my $repo_url  = join '/', 'http:', '', $repo_host, @repo_path, '';
+my $repo_web  = "http://$repo_host/?p=" . join('%2F', @repo_path);
+
 my %PREREQ_PM = (
  'Exporter' => 0,
  'XSLoader' => 0,
@@ -64,11 +103,16 @@ my %PREREQ_PM = (
 my %BUILD_REQUIRES = (
  'ExtUtils::MakeMaker' => 0,
  'Config'              => 0,
+ 'POSIX'               => 0,
  'Test::More'          => 0,
  %PREREQ_PM,
 );
 
 my %META = (
+ 'meta-spec' => {
+  version => '2',
+  url     => 'http://search.cpan.org/perldoc?CPAN::Meta::Spec',
+ },
  configure_requires => {
   'Config'              => 0,
   'ExtUtils::MakeMaker' => 0,
@@ -78,16 +122,23 @@ my %META = (
  },
  dynamic_config => 1,
  resources => {
-  bugtracker => "http://rt.cpan.org/NoAuth/ReportBug.html?Queue=$dist",
+  bugtracker => {
+   web    => $bug_web,
+   mailto => $bug_mailto,
+  },
   homepage   => "http://search.cpan.org/dist/$dist/",
   license    => 'http://dev.perl.org/licenses/',
-  repository => "http://git.profvince.com/?p=perl%2Fmodules%2F$dist.git",
+  repository => {
+   type => 'git',
+   url  => $repo_url,
+   web  => $repo_web,
+  },
  },
 );
 
 WriteMakefile(
  NAME             => $name,
- AUTHOR           => 'Vincent Pit <perl@profvince.com>',
+ AUTHOR           => 'Vincent Pit <vpit@cpan.org>',
  LICENSE          => 'perl',
  VERSION_FROM     => $file,
  ABSTRACT_FROM    => $file,
@@ -112,6 +163,6 @@ package MY;
 sub postamble {
  return <<'POSTAMBLE';
 testdeb: all
-	PERL_DL_NONLAZY=1 PERLDB_OPTS="NonStop=1" $(FULLPERLRUN) -MTAP::Harness -e 'TAP::Harness->new({verbosity => q{$(VERBOSE)}, lib => [ q{$(INST_LIB)}, q{$(INST_ARCHLIB)} ], switches => [ q{-d} ]})->runtests(@ARGV)' $(TEST_FILES)
+	PERL_DL_NONLAZY=1 PERLDB_OPTS="NonStop=1" $(FULLPERLRUN) -MTAP::Harness -e 'TAP::Harness->new({verbosity => q{$(TEST_VERBOSE)}, lib => [ q{$(INST_LIB)}, q{$(INST_ARCHLIB)} ], switches => [ q{-d} ]})->runtests(@ARGV)' $(TEST_FILES)
 POSTAMBLE
 }