MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:February 23 2010 11:33am
Subject:bzr commit into mysql-next-mr-cmake branch (vvaintroub:3098) Bug#51414
View as plain text  
#At file:///H:/bzr/mysql-next-mr-cmake/ based on revid:vvaintroub@stripped

 3098 Vladislav Vaintroub	2010-02-23
      Bug #51414:  Arguments with embedded spaces are not correctly handled by configure wrapper.
      The bug was that ./configure was  passing paramers to subscripts as $@, and to handle embedded spaces it needs
      to be quoted as "$@".
      This resulting into a bug when ./configure was called e.g with CFLAGS='-m64 -Xstrconst'..
      
      Additionally, fixed cmake/configure.pl did not handle environment variables passed on the command line.
      this is fixed in this push

    modified:
      BUILD/choose_configure.sh
      cmake/configure.pl
=== modified file 'BUILD/choose_configure.sh'
--- a/BUILD/choose_configure.sh	2009-11-09 11:32:48 +0000
+++ b/BUILD/choose_configure.sh	2010-02-23 11:32:57 +0000
@@ -7,8 +7,8 @@ cmake -P cmake/check_minimal_version.cma
 perl --version >/dev/null 2>&1 || HAVE_CMAKE=no
 if test "$HAVE_CMAKE" = "no"
 then
-  sh ./configure.am $@
+  sh ./configure.am "$@"
 else
-  perl ./cmake/configure.pl $@
+  perl ./cmake/configure.pl "$@"
 fi
 

=== modified file 'cmake/configure.pl'
--- a/cmake/configure.pl	2010-02-22 19:55:27 +0000
+++ b/cmake/configure.pl	2010-02-23 11:32:57 +0000
@@ -72,10 +72,21 @@ check_compiler("CXX", "CXXFLAGS");
 
 foreach my $option (@ARGV)
 {
-  if (substr ($option, 0, 2) == "--")
+  if (substr ($option, 0, 2) eq "--")
   {
     $option = substr($option, 2);
   }
+  else
+  {
+    # This must be environment variable
+    my @v  = split('=', $option);
+    my $name = shift(@v);
+    if(@v)
+    {
+      $ENV{$name} = join('=', @v);  
+    }	
+    next;
+  }
   if($option =~ /srcdir/)
   {
     $srcdir = substr($option,7);


Attachment: [text/bzr-bundle] bzr/vvaintroub@mysql.com-20100223113257-gg7cfwsw1059dvju.bundle
Thread
bzr commit into mysql-next-mr-cmake branch (vvaintroub:3098) Bug#51414Vladislav Vaintroub23 Feb