Commit e8eba534 authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files

Do-compile: 

 - applied some changes from the 4.0 tree (enable multiple 
   --conf-environment options, add --with-debug, don't add "-max"
   prefix just because BDB is enabled)
parent e042a3d2

Build-tools/Do-compile

+15 −9
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ $opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=0; 
GetOptions(

	"bdb",

	"build-thread=i",

	"config-env=s",

	"config-env=s" => \@config_env,

	"config-options=s" => \@config_options,

	"dbd-options=s",

	"debug",
@@ -45,6 +45,7 @@ GetOptions( 
	"use-old-distribution",

	"user=s",

	"version-suffix=s",

	"with-debug",

	"with-low-memory",

	"with-other-libc=s",

	"with-small-disk",
@@ -53,11 +54,6 @@ GetOptions( 
usage() if ($opt_help);

usage() if (!$opt_distribution);



if ($opt_bdb && $opt_version_suffix eq "")

{

  $opt_version_suffix="-max";

}



if (@make_options > 0)

{

	chomp(@make_options);
@@ -70,6 +66,12 @@ if (@config_options > 0) 
	$opt_config_options= join(" ", @config_options);

}



if (@config_env > 0)

{

	chomp(@config_env);

	$opt_config_env= join(" ", @config_env);

}



chomp($host=`hostname`);

$full_host_name=$host;

$connect_option= ($opt_tcpip ? "--host=$host" : "");
@@ -208,6 +210,7 @@ if ($opt_stage <= 1) 
  $opt_config_options.= " --disable-shared" if (!$opt_enable_shared); # Default for binary versions

  $opt_config_options.= " --with-berkeley-db" if ($opt_bdb);

  $opt_config_options.= " --with-client-ldflags=-all-static" if ($opt_static_client);

	$opt_config_options.= " --with-debug" if ($opt_with_debug);

  $opt_config_options.= " --with-libwrap" if ($opt_libwrap);

  $opt_config_options.= " --with-low-memory" if ($opt_with_low_memory);

  $opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server);
@@ -258,7 +261,7 @@ if ($opt_stage <= 3) 
  log_system("rm -fr mysql-3* mysql-4* $pwd/$host/*.tar.gz");

  log_system("nm -n sql/mysqld | gzip -9 -v 2>&1 > sql/mysqld.sym.gz | cat");



  $flags.= "--no-strip" if ($opt_no_strip);

  $flags.= "--no-strip" if ($opt_no_strip || $opt_with_debug);

  check_system("scripts/make_binary_distribution --tmp=$opt_tmp --suffix=$opt_suffix $flags",".tar.gz created");

  safe_system("mv mysql*.tar.gz $pwd/$host");

  if (-f "client/.libs/mysqladmin")
@@ -500,6 +503,9 @@ If user is empty then no mail is sent. 
--version-suffix suffix

Set name suffix (e.g. 'com' or '-max') for a distribution



--with-debug

Build binaries with debug information (implies "--no-strip")



--with-low-memory

Use less memory when compiling.
@@ -530,7 +536,7 @@ sub abort 
    print TMP "To: $email\n";

    print TMP "Subject: $ver$opt_version_suffix compilation failed\n\n";

    close TMP;

    system("tail -40 $log > $log.mail");

    system("tail -n 40 $log > $log.mail");

    system("cat $mail_header_file $log.mail | $sendmail -t -f $email");

    unlink($mail_header_file);

    unlink("$log.mail");
@@ -606,7 +612,7 @@ sub which 
  my(@progs)=@_;

  foreach $prog (@progs)

  {

    chomp($found=`which $prog | head -1`);

    chomp($found=`which $prog | head -n 1`);

    if ($? == 0 && $found ne "" && index($found," ") == -1)

    {

      $found =~ s|/+|/|g;	# Make nicer output