Commit 9018e9e7 authored by unknown's avatar unknown

- reworked Do-compile a bit (better failure report output, only build

   with InnoDB support when requested to do so)


Build-tools/Do-compile:
   - only build with InnoDB, if requested to do so (required to be able
     to build 4.0 "Classic" packages without InnoDB support)
   - Enhanced the failure report message subject a little
parent 55aa593a
...@@ -208,12 +208,15 @@ if ($opt_stage <= 1) ...@@ -208,12 +208,15 @@ if ($opt_stage <= 1)
$opt_config_options.= " --disable-shared" if (!$opt_enable_shared); # Default for binary versions $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-berkeley-db" if ($opt_bdb);
$opt_config_options.= " --with-client-ldflags=-all-static" if ($opt_static_client); $opt_config_options.= " --with-client-ldflags=-all-static" if ($opt_static_client);
$opt_config_options.= " --with-innodb" if ($opt_innodb);
$opt_config_options.= " --with-libwrap" if ($opt_libwrap); $opt_config_options.= " --with-libwrap" if ($opt_libwrap);
$opt_config_options.= " --with-low-memory" if ($opt_with_low_memory); $opt_config_options.= " --with-low-memory" if ($opt_with_low_memory);
$opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server); $opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server);
$opt_config_options.= " --with-raid" if ($opt_raid); $opt_config_options.= " --with-raid" if ($opt_raid);
# Only enable InnoDB when requested (required to be able to
# build the "Classic" packages that do not include InnoDB)
$opt_config_options.= " --without-innodb" if (!$opt_innodb);
if ($opt_with_other_libc) if ($opt_with_other_libc)
{ {
$opt_with_other_libc= " --with-other-libc=$opt_with_other_libc"; $opt_with_other_libc= " --with-other-libc=$opt_with_other_libc";
...@@ -516,9 +519,9 @@ sub abort ...@@ -516,9 +519,9 @@ sub abort
open(TMP,">$mail_header_file"); open(TMP,">$mail_header_file");
print TMP "From: mysql\@$full_host_name\n"; print TMP "From: mysql\@$full_host_name\n";
print TMP "To: $email\n"; print TMP "To: $email\n";
print TMP "Subject: MySQL compilation failed again\n\n"; print TMP "Subject: $ver$opt_version_suffix compilation failed\n\n";
close TMP; close TMP;
system("tail -30 $log > $log.mail"); system("tail -40 $log > $log.mail");
system("cat $mail_header_file $log.mail | $sendmail -t -f $email"); system("cat $mail_header_file $log.mail | $sendmail -t -f $email");
unlink($mail_header_file); unlink($mail_header_file);
unlink("$log.mail"); unlink("$log.mail");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment