Commit bcd8cd13 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

updated build scripts for new Linux build

parent ad308746

Build-tools/Do-all-build-steps

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ gmake -j 2 
time gmake -j 2 distcheck \

 EXTRA_CONF_ARGS="--with-unix-socket-path=/var/tmp/mysql.sock --with-low-memory $EXTRA_CONFIG"



sh $BD/Build-tools/Do-rpm

sh $BD/Build-tools/Do-rpm $*



rm -f $TMP_SCRIPT

END

Build-tools/Do-compile

+5 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $opt_tmp=$opt_version_suffix=""; 
$opt_help=$opt_Information=$opt_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_no_mysqltest=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=0;

$opt_innodb=$opt_bdb=0;



GetOptions("Information","help","distribution=s","user=s","result=s","delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution","enable-shared","no-crash-me","no-strip","version-suffix=s") || usage();

GetOptions("Information","help","distribution=s","user=s","result=s","delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution","enable-shared","no-crash-me","no-strip","version-suffix=s", "with-other-libc=s) || usage();



usage() if ($opt_help || $opt_Information);

usage() if (!$opt_distribution);
@@ -147,6 +147,10 @@ if ($opt_stage <= 1) 
  {

    $opt_config_options.=" --with-client-ldflags=-all-static";

  }

  if ($opt_with_other_libc)

  {

    $opt_with_other_libc = "--with-other-libc=$opt_with_other_libc";    

  }

  if (!$opt_enable_shared)

  {

    $opt_config_options.= " --disable-shared"; # Default for binary versions

Build-tools/Do-linux-build

0 → 100755
+18 −0
Original line number Diff line number Diff line 
#! /bin/sh



set -e -x

OTHER_LIBC_DIR=/usr/local/mysql-glibc



BUILD/compile-pentium-max --with-other-libc=$OTHER_LIBC_DIR \

  --with-comment="Official MySQL Binary"  \

  --prefix=/usr/local/mysql --with-extra-charset=complex \

  --enable-thread-safe-client --enable-local-infile \

  --with-server-suffix=-max

scripts/make_binary_distribution

make dist

Build-tools/Do-rpm --local

BUILD/compile-pentium --with-other-libc=$OTHER_LIBC_DIR \

  --with-comment="Official MySQL Binary" \

  --prefix=/usr/local/mysql --with-extra-charset=complex \

  --enable-thread-safe-client --enable-local-infile

scripts/make_binary_distribution

Build-tools/Do-rpm

+15 −1
Original line number Diff line number Diff line
@@ -38,7 +38,21 @@ owner=my 


# Hard path!!

bpath=`/bin/pwd`

rpmdir="/usr/src/redhat"



for d in /usr/src/redhat /usr/src/packages ; do

if test -d "$d"

then

  rpmdir=$d

fi  

done



if test -z "$rpmdir"

then

 echo "Could not find suitable rpmdir on this system"

 exit 1

fi

 



logdir="$bpath/Logs"



###### Perl STUFF #####

strings/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ EXTRA_DIST = ctype-big5.c ctype-czech.c ctype-euc_kr.c \ 
			strmake.c strnmov.c strmov.c strnlen.c \

			bmove_upp-sparc.s strappend-sparc.s strend-sparc.s \

			strinstr-sparc.s strmake-sparc.s strmov-sparc.s \

			strnmov-sparc.s strstr-sparc.s strxmov-sparc.s

			strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \

                        t_ctype.h



OMIT_DEPENDENCIES =	pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\

			__math.h time.h __time.h unistd.h __unistd.h types.h \