diff options
| author | unknown <kent.boortz@sun.com> | 2008-11-06 19:38:19 +0100 |
|---|---|---|
| committer | Build Team <bteam@astra04> | 2008-11-06 19:38:19 +0100 |
| commit | 2f08a0798d935ccd93e4bc2ee34dd60e0c9c3c0f (patch) | |
| tree | 597b1c9155fa14c05cfc6653eba9966dc7eb73bd /support-files | |
| parent | e9be23fae6129b96cf20fa5a0938a7bad77a5df2 (diff) | |
| download | mariadb-git-2f08a0798d935ccd93e4bc2ee34dd60e0c9c3c0f.tar.gz | |
Back merges from 6.0.8
- Removed some copy/paste between debug and normal build in RPM spec
- Removed "mysql_upgrade_shell" from RPM build
- Removed use of "grep -q" in "configure.in", not portable
- Improved test to disable ABI check not to accidently run for icc
Other changes
- Added make file test targets 'test-bt-fast' and 'test-bt-debug-fast'
- Reenabled "jp" test suite run
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 51 |
1 files changed, 23 insertions, 28 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index e7c090484b7..812b5958b91 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -279,7 +279,20 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ --mandir=%{_mandir} \ --enable-thread-safe-client \ --with-readline \ - " + --with-innodb \ +%if %{CLUSTER_BUILD} + --with-ndbcluster \ +%else + --without-ndbcluster \ +%endif + --with-archive-storage-engine \ + --with-csv-storage-engine \ + --with-blackhole-storage-engine \ + --with-federated-storage-engine \ + --with-partition \ + --with-big-tables \ + --enable-shared \ + " make } @@ -306,6 +319,8 @@ mkdir -p $RBR%{_libdir}/mysql PATH=${MYSQL_BUILD_PATH:-/bin:/usr/bin} export PATH +# Build the Debug binary. + # Use gcc for C and C++ code (to avoid a dependency on libstdc++ and # including exceptions into the code if [ -z "$CXX" -a -z "$CC" ] @@ -333,20 +348,8 @@ CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip / cd mysql-debug-%{mysql_version} && CFLAGS=\"$CFLAGS\" \ CXXFLAGS=\"$CXXFLAGS\" \ -BuildMySQL "--enable-shared \ +BuildMySQL "\ --with-debug \ - --with-innodb \ -%if %{CLUSTER_BUILD} - --with-ndbcluster \ -%else - --without-ndbcluster \ -%endif - --with-archive-storage-engine \ - --with-csv-storage-engine \ - --with-blackhole-storage-engine \ - --with-federated-storage-engine \ - --with-partition \ - --with-big-tables \ --with-comment=\"MySQL Community Server - Debug (GPL)\"") # We might want to save the config log file @@ -366,20 +369,8 @@ fi (cd mysql-release-%{mysql_version} && CFLAGS=\"$CFLAGS\" \ CXXFLAGS=\"$CXXFLAGS\" \ -BuildMySQL "--enable-shared \ - --with-innodb \ -%if %{CLUSTER_BUILD} - --with-ndbcluster \ -%else - --without-ndbcluster \ -%endif - --with-archive-storage-engine \ - --with-csv-storage-engine \ - --with-blackhole-storage-engine \ - --with-federated-storage-engine \ - --with-partition \ +BuildMySQL "\ --with-embedded-server \ - --with-big-tables \ --with-comment=\"MySQL Community Server (GPL)\"") # We might want to save the config log file if test -n "$MYSQL_CONFLOG_DEST" @@ -700,7 +691,6 @@ fi %attr(755, root, root) %{_bindir}/msql2mysql %attr(755, root, root) %{_bindir}/mysql %attr(755, root, root) %{_bindir}/mysql_find_rows -%attr(755, root, root) %{_bindir}/mysql_upgrade_shell %attr(755, root, root) %{_bindir}/mysql_waitpid %attr(755, root, root) %{_bindir}/mysqlaccess %attr(755, root, root) %{_bindir}/mysqladmin @@ -840,6 +830,11 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Thu Nov 06 2008 Kent Boortz <kent.boortz@sun.com> + +- Removed "mysql_upgrade_shell" +- Removed some copy/paste between debug and normal build + * Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com> - Modify CFLAGS and CXXFLAGS such that a debug build is not optimized. |