diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2014-07-02 09:38:43 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2014-07-02 09:38:43 +0200 |
| commit | b631743a9fc0039b5181a5d96341cdb8f2e494f9 (patch) | |
| tree | 37a14e13d804ac8baa1c3ad67ce95937dc007695 | |
| parent | 300dcbd6ee5ce6388557fbcb5645a66ce6dfb6e2 (diff) | |
| download | mariadb-git-b631743a9fc0039b5181a5d96341cdb8f2e494f9.tar.gz | |
Unconditionally disable dtrace for rpm, barfs on Oracle dtrace
| -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..7908e1b5d50 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 2 # @@ -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 |