X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FScalar-Vec-Util.git;a=blobdiff_plain;f=Makefile.PL;h=533f27d7ec3f82665a3d000d300c2d1d84d40320;hp=47a34611d907edadf0db07069ea9d409895c9dfb;hb=67ef1b78ed684058b943a47d8c2c008718165a2e;hpb=1e826e33bb740a6b2a1929e1661f2c95978924a1

diff --git a/Makefile.PL b/Makefile.PL
index 47a3461..533f27d 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,59 +7,93 @@ use ExtUtils::MakeMaker;
 BEGIN {
  eval { require Config };
  die 'OS unsupported' if $@;
- Config->import(qw/%Config/);
+ Config->import(qw<%Config>);
  eval { require File::Spec };
  die 'OS unsupported' if $@;
 }
 
-# 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;
-  }
+for (@ARGV) {
+ if (/^CC=(.*)/) {
+  $cc = $1;
+  last;
  }
 }
-my @C;
-if ($cc) {
- push @C, 'Util.c';
- print $cc, "\n";
+if (defined $cc) {
+ print "Forcing the use of $cc as the C compiler.\n";
 } else {
- print "none\n";
+ # 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};
+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;
+    print $cc, "\n";
+    last CC;
+   }
+  }
+ }
+ print "none\n" unless defined $cc;
 }
 
-my $arch = $Config{archname} || '';
-my ($cpu) = $arch =~ /^([^-]+)/;
+my @C;
+push @C, 'Util.c' if defined $cc;
 
 my @DEFINES;
-my $unit = 8;
-if (unpack("h*", pack("s", 0x1234)) != 4321) {
+
+sub is_little_endian {
+ my $order = $Config{byteorder};
+ return 0 unless $order;
+ my $len = length $order;
+ if ($len > 8) {
+  $order = substr $order, 0, 8;
+  $len   = 8;
+ }
+ 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 {
- my $align = int($Config{alignbytes} || 0);
  print "Checking unit size in bits... ";
- my @s = (8, 16, 32);
- push @s, 64 unless $^O eq 'MSWin32';
- for (@s) {
-  my $size = int($Config{'u' . $_ . 'size'} || 0);
-  $unit = $_ if $size && $size <= $align;
+ 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, "\n";
+ 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";
 }
-push @DEFINES, DEFINE => '-DBV_UNIT="'
-                                 . ($unit == 64 ? 'uint64_t' : 'U' . $unit)
-                                 . '"'
-                      . ' -DSVU_SIZE=' . $unit;
+
+@DEFINES = (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 %META = (
  configure_requires => {
   'Config'              => 0,
@@ -70,38 +104,36 @@ my %META = (
   'Config'              => 0,
   'ExtUtils::MakeMaker' => 0,
   'Test::More'          => 0,
+  %PREREQ_PM,
  },
+ dynamic_config => 1,
  resources => {
   bugtracker => "http://rt.cpan.org/NoAuth/ReportBug.html?Queue=$dist",
   homepage   => "http://search.cpan.org/dist/$dist/",
   license    => 'http://dev.perl.org/licenses/',
-  repository => "http://git.profvince.com/perl/modules/$dist.git",
+  repository => "http://git.profvince.com/?p=perl%2Fmodules%2F$dist.git",
  },
 );
 
 WriteMakefile(
-    NAME             => 'Scalar::Vec::Util',
-    AUTHOR           => 'Vincent Pit <perl@profvince.com>',
-    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
-    },
-    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 <perl@profvince.com>',
+ LICENSE          => 'perl',
+ VERSION_FROM     => $file,
+ ABSTRACT_FROM    => $file,
+ PL_FILES         => {},
+ C                => \@C,
+ @DEFINES,
+ 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*"
+ },
 );
 
 1;
@@ -110,7 +142,7 @@ package MY;
 
 sub postamble {
  my $cv = join ' -coverage ', 'cover',
-                            qw/statement branch condition path subroutine time/;
+                            qw<statement branch condition path subroutine time>;
  <<POSTAMBLE;
 cover test_cover:
 	$cv -test