X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Makefile.PL;h=42a215f802ddaba06ba27d678077db61b0f21d19;hb=c4a764bda5221cbd26c8a4e719cee49059703af6;hp=5f5b4159fb101f5b97136aab49dbe4364f94b459;hpb=6ed0ffe5e7bcc7c73bcc7c15d2305dba50584936;p=perl%2Fmodules%2FScalar-Vec-Util.git

diff --git a/Makefile.PL b/Makefile.PL
index 5f5b415..42a215f 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -35,28 +35,42 @@ 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";
+}
+
+{
+ 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';
 
@@ -91,7 +105,8 @@ WriteMakefile(
     PREREQ_PM        => {
         'Exporter' => 0,
         'Carp'     => 0,
-        'XSLoader' => 0
+        'XSLoader' => 0,
+        'base'     => 0,
     },
     MIN_PERL_VERSION => 5.006,
     META_MERGE       => \%META,