From 0f7022c6f3c75c052526507c6a4783b092ecde7a Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Thu, 12 Apr 2018 05:15:39 +0300 Subject: [PATCH] Renamed compile-pentium scripts to compile-pentium32 This is to align the naming to compile-pentium64 and to avoid mistakes of accidently compiling a 32 bit binary on a 64 bit system Removed also a few very old not usable BUILD scripts --- BUILD/compile-alpha | 24 ----------------- BUILD/compile-alpha-debug | 12 --------- BUILD/compile-amd64-debug-wsrep | 0 BUILD/compile-amd64-wsrep | 0 BUILD/compile-ia64-debug-max | 25 ----------------- BUILD/compile-innodb | 25 ----------------- BUILD/compile-pentium-debug-all | 10 ------- BUILD/compile-pentium-debug-max-no-embedded | 25 ----------------- BUILD/compile-pentium-debug-wsrep | 12 --------- BUILD/compile-pentium-debug-yassl | 26 ------------------ BUILD/compile-pentium-icc-yassl | 0 BUILD/{compile-pentium => compile-pentium32} | 0 ...entium-cybozu => compile-pentium32-cybozu} | 0 ...-pentium-debug => compile-pentium32-debug} | 0 ...-debug-max => compile-pentium32-debug-max} | 0 ...penssl => compile-pentium32-debug-openssl} | 0 ...le-pentium-gcov => compile-pentium32-gcov} | 0 ...-pentium-gprof => compile-pentium32-gprof} | 0 ...max => compile-pentium32-icc-valgrind-max} | 0 ...pile-pentium-max => compile-pentium32-max} | 0 ...ind-max => compile-pentium32-valgrind-max} | 0 ...-pentium-wsrep => compile-pentium32-wsrep} | 0 BUILD/compile-pentium64-wsrep | 0 BUILD/compile-solaris-x86-32 | 11 -------- BUILD/compile-solaris-x86-32-debug | 11 -------- BUILD/compile-solaris-x86-32-debug-forte | 27 ------------------- BUILD/compile-solaris-x86-forte-32 | 19 ------------- 27 files changed, 227 deletions(-) delete mode 100755 BUILD/compile-alpha delete mode 100755 BUILD/compile-alpha-debug mode change 100644 => 100755 BUILD/compile-amd64-debug-wsrep mode change 100644 => 100755 BUILD/compile-amd64-wsrep delete mode 100755 BUILD/compile-ia64-debug-max delete mode 100755 BUILD/compile-innodb delete mode 100755 BUILD/compile-pentium-debug-all delete mode 100755 BUILD/compile-pentium-debug-max-no-embedded delete mode 100644 BUILD/compile-pentium-debug-wsrep delete mode 100755 BUILD/compile-pentium-debug-yassl mode change 100644 => 100755 BUILD/compile-pentium-icc-yassl rename BUILD/{compile-pentium => compile-pentium32} (100%) rename BUILD/{compile-pentium-cybozu => compile-pentium32-cybozu} (100%) rename BUILD/{compile-pentium-debug => compile-pentium32-debug} (100%) rename BUILD/{compile-pentium-debug-max => compile-pentium32-debug-max} (100%) rename BUILD/{compile-pentium-debug-openssl => compile-pentium32-debug-openssl} (100%) rename BUILD/{compile-pentium-gcov => compile-pentium32-gcov} (100%) rename BUILD/{compile-pentium-gprof => compile-pentium32-gprof} (100%) rename BUILD/{compile-pentium-icc-valgrind-max => compile-pentium32-icc-valgrind-max} (100%) rename BUILD/{compile-pentium-max => compile-pentium32-max} (100%) rename BUILD/{compile-pentium-valgrind-max => compile-pentium32-valgrind-max} (100%) rename BUILD/{compile-pentium-wsrep => compile-pentium32-wsrep} (100%) mode change 100644 => 100755 mode change 100644 => 100755 BUILD/compile-pentium64-wsrep delete mode 100755 BUILD/compile-solaris-x86-32 delete mode 100755 BUILD/compile-solaris-x86-32-debug delete mode 100755 BUILD/compile-solaris-x86-32-debug-forte delete mode 100755 BUILD/compile-solaris-x86-forte-32 diff --git a/BUILD/compile-alpha b/BUILD/compile-alpha deleted file mode 100755 index 45f72eb90e1..00000000000 --- a/BUILD/compile-alpha +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2000, 2002 MySQL AB -# Use is subject to license terms -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - -path=`dirname $0` -. "$path/SETUP.sh" - -extra_flags="$alpha_cflags $fast_cflags" -extra_configs="$alpha_configs $static_link" - -. "$path/FINISH.sh" diff --git a/BUILD/compile-alpha-debug b/BUILD/compile-alpha-debug deleted file mode 100755 index 2d8869227dc..00000000000 --- a/BUILD/compile-alpha-debug +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh - -/bin/rm -f */.deps/*.P */*.o -make -k maintainer-clean -/bin/rm -f */.deps/*.P */*.o -/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache mysql-*.tar.gz - -path=`dirname $0` -. "$path/autorun.sh" - -CFLAGS=-O1 CC=gcc CXX=g++ CXXFLAGS="-O1 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-debug --with-extra-charsets=complex --without-extra-tools -make diff --git a/BUILD/compile-amd64-debug-wsrep b/BUILD/compile-amd64-debug-wsrep old mode 100644 new mode 100755 diff --git a/BUILD/compile-amd64-wsrep b/BUILD/compile-amd64-wsrep old mode 100644 new mode 100755 diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max deleted file mode 100755 index 508cadf73e2..00000000000 --- a/BUILD/compile-ia64-debug-max +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh - -# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -gmake -k maintainer-clean || true -/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache - -path=`dirname $0` -. "$path/autorun.sh" - -CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static --with-debug --with-innodb --with-embedded-server --with-archive-storage-engine -gmake diff --git a/BUILD/compile-innodb b/BUILD/compile-innodb deleted file mode 100755 index fa791282b28..00000000000 --- a/BUILD/compile-innodb +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, -# Fifth Floor, Boston, MA 02110-1301 USA -# - -# we assume this script is in storage/innobase/ - -MYSQL_ROOT="$(dirname ${0})/../.." - -cd ${MYSQL_ROOT} - -cmake -DWITH_INNOBASE_STORAGE_ENGINE:BOOL=ON -make -j$(nproc) diff --git a/BUILD/compile-pentium-debug-all b/BUILD/compile-pentium-debug-all deleted file mode 100755 index 9ed5bf6b2cd..00000000000 --- a/BUILD/compile-pentium-debug-all +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh - -path=`dirname $0` -set -- "$@" --with-debug=full -. "$path/SETUP.sh" - -extra_flags="$pentium_cflags $debug_cflags" -extra_configs="$pentium_configs $debug_configs $all_configs $error_inject --with-experimental-collations $disable_64_bit_plugins" - -. "$path/FINISH.sh" diff --git a/BUILD/compile-pentium-debug-max-no-embedded b/BUILD/compile-pentium-debug-max-no-embedded deleted file mode 100755 index d8bc896f89c..00000000000 --- a/BUILD/compile-pentium-debug-max-no-embedded +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh - -# Copyright (c) 2004-2006 MySQL AB -# Use is subject to license terms -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - -path=`dirname $0` -. "$path/SETUP.sh" - -extra_flags="$pentium_cflags $debug_cflags" -extra_configs="$pentium_configs $debug_configs $max_no_embedded_configs $disable_64_bit_plugins" - -. "$path/FINISH.sh" diff --git a/BUILD/compile-pentium-debug-wsrep b/BUILD/compile-pentium-debug-wsrep deleted file mode 100644 index 6528ed77f95..00000000000 --- a/BUILD/compile-pentium-debug-wsrep +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh -x - -path=`dirname $0` -set -- "$@" --with-debug=full -. "$path/SETUP.sh" - -extra_flags="$pentium_cflags $debug_cflags -g -O0 $wsrep_cflags" -c_warnings="$c_warnings $debug_extra_warnings" -cxx_warnings="$cxx_warnings $debug_extra_warnings" -extra_configs="$pentium_configs $debug_configs $wsrep_configs --with-wsrep $disable_64_bit_plugins" - -. "$path/FINISH.sh" diff --git a/BUILD/compile-pentium-debug-yassl b/BUILD/compile-pentium-debug-yassl deleted file mode 100755 index e8cfff6cb07..00000000000 --- a/BUILD/compile-pentium-debug-yassl +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh - -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -path=`dirname $0` -. "$path/SETUP.sh" - -extra_flags="$pentium_cflags $debug_cflags" -extra_configs="$pentium_configs $debug_configs" - -extra_configs="$extra_configs --with-debug --with-ssl" - -. "$path/FINISH.sh" diff --git a/BUILD/compile-pentium-icc-yassl b/BUILD/compile-pentium-icc-yassl old mode 100644 new mode 100755 diff --git a/BUILD/compile-pentium b/BUILD/compile-pentium32 similarity index 100% rename from BUILD/compile-pentium rename to BUILD/compile-pentium32 diff --git a/BUILD/compile-pentium-cybozu b/BUILD/compile-pentium32-cybozu similarity index 100% rename from BUILD/compile-pentium-cybozu rename to BUILD/compile-pentium32-cybozu diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium32-debug similarity index 100% rename from BUILD/compile-pentium-debug rename to BUILD/compile-pentium32-debug diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium32-debug-max similarity index 100% rename from BUILD/compile-pentium-debug-max rename to BUILD/compile-pentium32-debug-max diff --git a/BUILD/compile-pentium-debug-openssl b/BUILD/compile-pentium32-debug-openssl similarity index 100% rename from BUILD/compile-pentium-debug-openssl rename to BUILD/compile-pentium32-debug-openssl diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium32-gcov similarity index 100% rename from BUILD/compile-pentium-gcov rename to BUILD/compile-pentium32-gcov diff --git a/BUILD/compile-pentium-gprof b/BUILD/compile-pentium32-gprof similarity index 100% rename from BUILD/compile-pentium-gprof rename to BUILD/compile-pentium32-gprof diff --git a/BUILD/compile-pentium-icc-valgrind-max b/BUILD/compile-pentium32-icc-valgrind-max similarity index 100% rename from BUILD/compile-pentium-icc-valgrind-max rename to BUILD/compile-pentium32-icc-valgrind-max diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium32-max similarity index 100% rename from BUILD/compile-pentium-max rename to BUILD/compile-pentium32-max diff --git a/BUILD/compile-pentium-valgrind-max b/BUILD/compile-pentium32-valgrind-max similarity index 100% rename from BUILD/compile-pentium-valgrind-max rename to BUILD/compile-pentium32-valgrind-max diff --git a/BUILD/compile-pentium-wsrep b/BUILD/compile-pentium32-wsrep old mode 100644 new mode 100755 similarity index 100% rename from BUILD/compile-pentium-wsrep rename to BUILD/compile-pentium32-wsrep diff --git a/BUILD/compile-pentium64-wsrep b/BUILD/compile-pentium64-wsrep old mode 100644 new mode 100755 diff --git a/BUILD/compile-solaris-x86-32 b/BUILD/compile-solaris-x86-32 deleted file mode 100755 index 29965524479..00000000000 --- a/BUILD/compile-solaris-x86-32 +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -path=`dirname $0` -. "$path/SETUP.sh" -extra_flags="-D__sun -m32" -extra_configs="$max_configs --with-libevent" - -LDFLAGS="-lmtmalloc -R/usr/sfw/lib" -export LDFLAGS - -. "$path/FINISH.sh" diff --git a/BUILD/compile-solaris-x86-32-debug b/BUILD/compile-solaris-x86-32-debug deleted file mode 100755 index 9ce91495c1c..00000000000 --- a/BUILD/compile-solaris-x86-32-debug +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -path=`dirname $0` -. "$path/SETUP.sh" -extra_flags="-D__sun -m32 $debug_cflags" -extra_configs="$max_configs --with-libevent $debug_configs" - -LDFLAGS="-lmtmalloc -R/usr/sfw/lib" -export LDFLAGS - -. "$path/FINISH.sh" diff --git a/BUILD/compile-solaris-x86-32-debug-forte b/BUILD/compile-solaris-x86-32-debug-forte deleted file mode 100755 index 777360865a2..00000000000 --- a/BUILD/compile-solaris-x86-32-debug-forte +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -path=`dirname $0` -. "$path/SETUP.sh" - -# Take only #define options - the others are gcc specific. -# (real fix is for SETUP.sh not to put gcc specific options in $debug_cflags) -DEFS="" -for F in $debug_cflags ; do - expr "$F" : "^-D" && DEFS="$DEFS $F" -done -debug_cflags="-O0 -g $DEFS" - -extra_flags="-m32 -mt -D_FORTEC_ -xbuiltin=%all -xlibmil -xlibmopt -fns=no -xprefetch=auto -xprefetch_level=3 $debug_cflags" -extra_configs="$max_configs --with-libevent $debug_configs" - -warnings="" -c_warnings="" -cxx_warnings="" -base_cxxflags="-noex" - -CC=cc -CFLAGS="-xstrconst" -CXX=CC -LDFLAGS="-lmtmalloc" - -. "$path/FINISH.sh" diff --git a/BUILD/compile-solaris-x86-forte-32 b/BUILD/compile-solaris-x86-forte-32 deleted file mode 100755 index 5aac376a44c..00000000000 --- a/BUILD/compile-solaris-x86-forte-32 +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -path=`dirname $0` -. "$path/SETUP.sh" - -extra_flags="-m32 -mt -D_FORTEC_ -xbuiltin=%all -xlibmil -xlibmopt -fns=no -xprefetch=auto -xprefetch_level=3" -extra_configs="$max_configs --with-libevent" - -warnings="" -c_warnings="" -cxx_warnings="" -base_cxxflags="-noex" - -CC=cc -CFLAGS="-xstrconst" -CXX=CC -LDFLAGS="-lmtmalloc" - -. "$path/FINISH.sh"