Make $Config{byteorder} more magical so that it is

dynamically computed: nice for 'fat binaries'.

Subject: [PATCH]: default byteorder
Message-Id: <200008010245.TAA04459@ns1.abstrata.com>

p4raw-id: //depot/perl@6671

1 files changed, 39 insertions, 26 deletions

diff --git a/configpm b/configpm
index c64af8a13b..193a8a7032 100755
--- a/configpm
+++ b/configpm
@@ -128,41 +128,54 @@ sub FETCH {
 
     # Search for it in the big string 
     my($value, $start, $marker, $quote_type);
-    $marker = "$_[1]=";
+
     $quote_type = "'";
-    # return undef unless (($value) = $config_sh =~ m/^$_[1]='(.*)'\s*$/m);
-    # Check for the common case, ' delimeted
-    $start = index($config_sh, "\n$marker$quote_type");
-    # If that failed, check for " delimited
-    if ($start == -1) {
-      $quote_type = '"';
-      $start = index($config_sh, "\n$marker$quote_type");
-    }
-    return undef if ( ($start == -1) &&  # in case it's first 
-        (substr($config_sh, 0, length($marker)) ne $marker) );
-    if ($start == -1) { 
-      # It's the very first thing we found. Skip $start forward
-      # and figure out the quote mark after the =.
-      $start = length($marker) + 1;
-      $quote_type = substr($config_sh, $start - 1, 1);
-    } 
-    else { 
-      $start += length($marker) + 2;
+    if ($_[1] eq 'byteorder') {
+        my $t = $Config{ivtype};
+        my $s = $Config{ivsize};
+        my $f = $t eq 'long' ? 'L!' : $s == 8 ? 'Q': 'I';
+        my $i = unpack($f, pack('C*', map { ord() } 1..$s));
+        if ($s == 4 || $s == 8) {
+            $value = join('', unpack('a'x$s, pack($f, $i)));
+        } else {
+            $value = '?'x$s;
+        }
+    } else {
+	$marker = "$_[1]=";
+	# return undef unless (($value) = $config_sh =~ m/^$_[1]='(.*)'\s*$/m);
+	# Check for the common case, ' delimeted
+	$start = index($config_sh, "\n$marker$quote_type");
+	# If that failed, check for " delimited
+	if ($start == -1) {
+	    $quote_type = '"';
+	    $start = index($config_sh, "\n$marker$quote_type");
+	}
+	return undef if ( ($start == -1) &&  # in case it's first 
+			  (substr($config_sh, 0, length($marker)) ne $marker) );
+	if ($start == -1) { 
+	    # It's the very first thing we found. Skip $start forward
+	    # and figure out the quote mark after the =.
+	    $start = length($marker) + 1;
+	    $quote_type = substr($config_sh, $start - 1, 1);
+	} 
+	else { 
+	    $start += length($marker) + 2;
+	}
+	$value = substr($config_sh, $start, 
+			index($config_sh, "$quote_type\n", $start) - $start);
     }
-    $value = substr($config_sh, $start, 
-        index($config_sh, "$quote_type\n", $start) - $start);
- 
     # If we had a double-quote, we'd better eval it so escape
     # sequences and such can be interpolated. Since the incoming
     # value is supposed to follow shell rules and not perl rules,
     # we escape any perl variable markers
     if ($quote_type eq '"') {
-      $value =~ s/\$/\\\$/g;
-      $value =~ s/\@/\\\@/g;
-      eval "\$value = \"$value\"";
+	$value =~ s/\$/\\\$/g;
+	$value =~ s/\@/\\\@/g;
+	eval "\$value = \"$value\"";
     }
     #$value = sprintf($value) if $quote_type eq '"';
-    $value = undef if $value eq 'undef'; # So we can say "if $Config{'foo'}".
+    # So we can say "if $Config{'foo'}".
+    $value = undef if $value eq 'undef';
     $_[0]->{$_[1]} = $value; # cache it
     return $value;
 }