diff options
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 10 | ||||
| -rw-r--r-- | BUILD/SETUP.sh.rej | 19 |
2 files changed, 28 insertions, 1 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 274676e0ead..3316b1dd525 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -139,9 +139,17 @@ fi # base_configs="--prefix=$prefix --enable-assembler " base_configs="$base_configs --with-extra-charsets=complex " -base_configs="$base_configs --enable-thread-safe-client --with-readline " +base_configs="$base_configs --enable-thread-safe-client " base_configs="$base_configs --with-big-tables" +if test -d "$path/../cmd-line-utils/readline" +then + base_configs="$base_configs --with-readline" +elif test -d "$path/../cmd-line-utils/libedit" +then + base_configs="$base_configs --with-libedit" +fi + static_link="--with-mysqld-ldflags=-all-static " static_link="$static_link --with-client-ldflags=-all-static" # we need local-infile in all binaries for rpl000001 diff --git a/BUILD/SETUP.sh.rej b/BUILD/SETUP.sh.rej new file mode 100644 index 00000000000..ccbcaa4404f --- /dev/null +++ b/BUILD/SETUP.sh.rej @@ -0,0 +1,19 @@ +*************** +*** 39,46 **** + c_warnings="$global_warnings -Wunused" + cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" + +! alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet +! pentium_cflags="-mcpu=pentiumpro" + sparc_cflags="" + + # be as fast as we can be without losing our ability to backtrace +--- 39,46 ---- + c_warnings="$global_warnings -Wunused" + cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" + +! #alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet +! #pentium_cflags="-mcpu=pentiumpro" + sparc_cflags="" + + # be as fast as we can be without losing our ability to backtrace |