diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2014-07-01 15:19:30 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2014-07-01 15:19:30 +0200 |
| commit | 300dcbd6ee5ce6388557fbcb5645a66ce6dfb6e2 (patch) | |
| tree | b94d5591a3d41cc4c3fd41db691fdbe782099981 /packaging | |
| parent | 3bba29a3970f8ef05b85cec49dc7caead20e759b (diff) | |
| download | mariadb-git-300dcbd6ee5ce6388557fbcb5645a66ce6dfb6e2.tar.gz | |
Unconditionally disable dtrace for rpm-oel, barfs on Oracle dtrace
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm-oel/mysql.spec.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index 853365cb14b..bb596c35ac3 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -85,7 +85,7 @@ Name: mysql-%{product_suffix} Summary: A very fast and reliable SQL database server Group: Applications/Databases Version: @VERSION@ -Release: 2%{?commercial:.1}%{?dist} +Release: 3%{?commercial:.1}%{?dist} License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field. Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz URL: http://www.mysql.com/ @@ -495,6 +495,7 @@ mkdir debug -DBUILD_CONFIG=mysql_release \ -DINSTALL_LAYOUT=RPM \ -DCMAKE_BUILD_TYPE=Debug \ + -DENABLE_DTRACE=OFF \ -DCMAKE_C_FLAGS="$optflags" \ -DCMAKE_CXX_FLAGS="$optflags" \ -DINSTALL_LIBDIR="%{_lib}/mysql" \ @@ -519,6 +520,7 @@ mkdir release -DBUILD_CONFIG=mysql_release \ -DINSTALL_LAYOUT=RPM \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DENABLE_DTRACE=OFF \ -DCMAKE_C_FLAGS="%{optflags}" \ -DCMAKE_CXX_FLAGS="%{optflags}" \ -DINSTALL_LIBDIR="%{_lib}/mysql" \ @@ -909,6 +911,9 @@ fi %endif %changelog +* Tue Jul 01 2014 Bjorn Munch <bjorn.munch@oracle.com> - 5.5.39-3 +- Disable dtrace, as it fails on OEL6 boxes with Oracle dtrace installed + * Thu Jun 26 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-2 - Resolve embedded-devel conflict issue |