diff options
| author | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2014-07-09 12:39:19 +0200 |
|---|---|---|
| committer | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2014-07-09 12:39:19 +0200 |
| commit | 354e923cfeef4909bd75ec4bfded8a0e53bb9cdb (patch) | |
| tree | 6bd3ccd3bc5b15db812c68f5e3cc1852c95a58ea /support-files | |
| parent | 9956d716378c7b5473988058d7680fdc39af5bde (diff) | |
| parent | b2521f52dd8591c12793995b22308379795df80d (diff) | |
| download | mariadb-git-354e923cfeef4909bd75ec4bfded8a0e53bb9cdb.tar.gz | |
Bug#19172145 - Remove perl(GD) and dtrace dependencies and bench fix
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index d8de3a41e7f..082d1fcfef1 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -30,7 +30,7 @@ %global mysqld_group mysql %global mysqldatadir /var/lib/mysql -%global release 1 +%global release 1 # @@ -511,6 +511,7 @@ mkdir debug # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ -DCMAKE_BUILD_TYPE=Debug \ + -DENABLE_DTRACE=OFF \ -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ -DFEATURE_SET="%{feature_set}" \ -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \ @@ -526,6 +527,7 @@ mkdir release # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DENABLE_DTRACE=OFF \ -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ -DFEATURE_SET="%{feature_set}" \ -DCOMPILATION_COMMENT="%{compilation_comment_release}" \ @@ -1217,6 +1219,9 @@ echo "=====" >> $STATUS_HISTORY # merging BK trees) ############################################################################## %changelog +* Wed Jul 02 2014 Bjorn Munch <bjorn.munch@oracle.com> +- Disable dtrace unconditionally, breaks after we install Oracle dtrace + * Wed Oct 30 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - Removed non gpl file docs/mysql.info from community packages |