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

diff --git a/Makefile.PL b/Makefile.PL
index 47a3461..e249569 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -35,31 +35,52 @@ if ($cc) {
  print "none\n";
 }
 
-my $arch = $Config{archname} || '';
-my ($cpu) = $arch =~ /^([^-]+)/;
-
 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";
 }
-push @DEFINES, DEFINE => '-DBV_UNIT="'
-                                 . ($unit == 64 ? 'uint64_t' : 'U' . $unit)
-                                 . '"'
-                      . ' -DSVU_SIZE=' . $unit;
+
+{
+ my $bits = $unit->{bits};
+ push @DEFINES, '-DBV_UNIT="' . ($Config{"u${bits}type"} || "U$bits") . '"';
+ push @DEFINES, "-DSVU_SIZE=$bits";
+}
+
+@DEFINES = (DEFINE => join ' ', @DEFINES) if @DEFINES;
 
 my $dist = 'Scalar-Vec-Util';
 
+my %PREREQ_PM = (
+ 'Exporter' => 0,
+ 'Carp'     => 0,
+ 'XSLoader' => 0,
+ 'base'     => 0,
+);
+
 my %META = (
  configure_requires => {
   'Config'              => 0,
@@ -70,12 +91,14 @@ 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",
  },
 );
 
@@ -88,11 +111,7 @@ WriteMakefile(
     PL_FILES         => {},
     C                => \@C,
     @DEFINES,
-    PREREQ_PM        => {
-        'Exporter' => 0,
-        'Carp'     => 0,
-        'XSLoader' => 0
-    },
+    PREREQ_PM        => \%PREREQ_PM,
     MIN_PERL_VERSION => 5.006,
     META_MERGE       => \%META,
     dist             => {