bzr commit into mysql-5.1 branch (df:2696)

[Daniel Fischer]

#At file:///shared/home/df/mysql/bazaar/mysql-5.1-preconfigure/

 2696 Daniel Fischer	2008-10-21 [merge]
      merge
modified:
  BUILD/preconfigure

=== modified file 'BUILD/preconfigure'
--- a/BUILD/preconfigure	2008-10-21 16:01:17 +0000
+++ b/BUILD/preconfigure	2008-10-21 18:12:37 +0000
@@ -77,7 +77,7 @@
 # -----------
 #
 # For environment variables:
-# - the value is split at blanks
+# - the value is split at blanks, all ^ in the parts are replaced with blanks
 # - if the variable name is prefixed with a +, the value of that variable in
 #   the current configuration is replaced with the set union of it and the
 #   blank-delimited parts specified in the new value
@@ -750,9 +750,9 @@ our $platforms = {
 #
     'osx10.5-x86_64' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch x86_64 -fno-common',
+            'CFLAGS' => '-g -Os -arch^x86_64 -fno-common',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -Os -arch x86_64 -felide-constructors -fno-common',
+            'CXXFLAGS' => '-g -Os -arch^x86_64 -felide-constructors -fno-common',
             'CXX' => 'gcc -static-libgcc',
         },
         'opt' => {
@@ -764,10 +764,10 @@ our $platforms = {
 #
     'osx10.5-powerpc-32bit' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch ppc -fno-common',
+            'CFLAGS' => '-g -Os -arch^ppc -fno-common',
             'CC' => 'gcc -static-libgcc',
-            'LDFLAGS' => '-arch ppc',
-            'CXXFLAGS' => '-g -Os -arch ppc -felide-constructors -fno-common',
+            'LDFLAGS' => '-arch^ppc',
+            'CXXFLAGS' => '-g -Os -arch^ppc -felide-constructors -fno-common',
             'CXX' => 'gcc -static-libgcc',
         },
         'opt' => {
@@ -779,10 +779,10 @@ our $platforms = {
 #
     'osx10.5-powerpc-64bit' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch ppc64 -fno-common',
+            'CFLAGS' => '-g -Os -arch^ppc64 -fno-common',
             'CC' => 'gcc -static-libgcc',
-            'LDFLAGS' => '-arch ppc64',
-            'CXXFLAGS' => '-g -Os -arch ppc64 -felide-constructors -fno-common',
+            'LDFLAGS' => '-arch^ppc64',
+            'CXXFLAGS' => '-g -Os -arch^ppc64 -felide-constructors -fno-common',
             'CXX' => 'gcc -static-libgcc',
         },
         'opt' => {
@@ -794,9 +794,9 @@ our $platforms = {
 #
     'osx10.5-x86' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch i386 -fno-common',
+            'CFLAGS' => '-g -Os -arch^i386 -fno-common',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -Os -arch i386 -felide-constructors -fno-common',
+            'CXXFLAGS' => '-g -Os -arch^i386 -felide-constructors -fno-common',
             'CXX' => 'gcc -static-libgcc',
         },
         'opt' => {
@@ -808,10 +808,10 @@ our $platforms = {
 #
     'osx10.4-powerpc-64bit' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch ppc64 -fno-common',
+            'CFLAGS' => '-g -Os -arch^ppc64 -fno-common',
             'CC' => 'gcc -static-libgcc',
-            'LDFLAGS' => '-arch ppc64',
-            'CXXFLAGS' => '-g -Os -arch ppc64 -felide-constructors -fno-common',
+            'LDFLAGS' => '-arch^ppc64',
+            'CXXFLAGS' => '-g -Os -arch^ppc64 -felide-constructors -fno-common',
             'CXX' => 'gcc -static-libgcc',
         },
         'opt' => {
@@ -823,9 +823,9 @@ our $platforms = {
 #
     'osx10.4-x86' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch i386 -fno-common',
+            'CFLAGS' => '-g -Os -arch^i386 -fno-common',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -Os -arch i386 -felide-constructors -fno-common',
+            'CXXFLAGS' => '-g -Os -arch^i386 -felide-constructors -fno-common',
             'CXX' => 'gcc -static-libgcc',
         },
         'opt' => {
@@ -837,9 +837,9 @@ our $platforms = {
 #
     'osx10.4-powerpc-32bit' => {
         'env' => {
-            'CFLAGS' => '-g -Os -arch ppc -fno-common',
+            'CFLAGS' => '-g -Os -arch^ppc -fno-common',
             'CC' => 'gcc -static-libgcc',
-            'CXXFLAGS' => '-g -Os -arch ppc -felide-constructors -fno-common',
+            'CXXFLAGS' => '-g -Os -arch^ppc -felide-constructors -fno-common',
             'CXX' => 'gcc -static-libgcc',
         },
         'opt' => {
@@ -1028,7 +1028,7 @@ sub aggregate {
             $parts = $p;
         } else {
             # otherwise, split on blank to create a list of values
-            $parts = [ split / +/, $p ];
+            $parts = [ map { y/^/ /; $_ } split / +/, $p ];
         }
         # determine the mode by which to apply this individual change
         # the default is replacing any existing variable with the new content