1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #51414: Arguments with embedded spaces are not correctly handled by configure wrapper.

Browse Source 
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
This commit is contained in:
Vladislav Vaintroub 2010-02-23 12:32:57 +01:00
parent f4284ba6bd
commit c88200172e
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD/choose_configure.sh
View File

@ -7,8 +7,8 @@ cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no
perl --version >/dev/null 2>&1 || HAVE_CMAKE=no perl --version >/dev/null 2>&1 || HAVE_CMAKE=no
if test "$HAVE_CMAKE" = "no" if test "$HAVE_CMAKE" = "no"
then then
sh ./configure.am $@ sh ./configure.am "$@"
else else
perl ./cmake/configure.pl $@ perl ./cmake/configure.pl "$@"
fi fi

13
cmake/configure.pl
View File

@ -72,10 +72,21 @@ check_compiler("CXX", "CXXFLAGS");
foreach my $option (@ARGV) foreach my $option (@ARGV)
{ {
if (substr ($option, 0, 2) == "--") if (substr ($option, 0, 2) eq "--")
{ {
$option = substr($option, 2); $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/) if($option =~ /srcdir/)
{ {
$srcdir = substr($option,7); $srcdir = substr($option,7);