Commit d28b07ae authored by Bjorn Munch's avatar Bjorn Munch

Unconditionally disable dtrace for rpm-oel, barfs on Oracle dtrace

parent 94061083
...@@ -85,7 +85,7 @@ Name: mysql-%{product_suffix} ...@@ -85,7 +85,7 @@ Name: mysql-%{product_suffix}
Summary: A very fast and reliable SQL database server Summary: A very fast and reliable SQL database server
Group: Applications/Databases Group: Applications/Databases
Version: @VERSION@ 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. 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 Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
URL: http://www.mysql.com/ URL: http://www.mysql.com/
...@@ -495,6 +495,7 @@ mkdir debug ...@@ -495,6 +495,7 @@ mkdir debug
-DBUILD_CONFIG=mysql_release \ -DBUILD_CONFIG=mysql_release \
-DINSTALL_LAYOUT=RPM \ -DINSTALL_LAYOUT=RPM \
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DENABLE_DTRACE=OFF \
-DCMAKE_C_FLAGS="$optflags" \ -DCMAKE_C_FLAGS="$optflags" \
-DCMAKE_CXX_FLAGS="$optflags" \ -DCMAKE_CXX_FLAGS="$optflags" \
-DINSTALL_LIBDIR="%{_lib}/mysql" \ -DINSTALL_LIBDIR="%{_lib}/mysql" \
...@@ -519,6 +520,7 @@ mkdir release ...@@ -519,6 +520,7 @@ mkdir release
-DBUILD_CONFIG=mysql_release \ -DBUILD_CONFIG=mysql_release \
-DINSTALL_LAYOUT=RPM \ -DINSTALL_LAYOUT=RPM \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DENABLE_DTRACE=OFF \
-DCMAKE_C_FLAGS="%{optflags}" \ -DCMAKE_C_FLAGS="%{optflags}" \
-DCMAKE_CXX_FLAGS="%{optflags}" \ -DCMAKE_CXX_FLAGS="%{optflags}" \
-DINSTALL_LIBDIR="%{_lib}/mysql" \ -DINSTALL_LIBDIR="%{_lib}/mysql" \
...@@ -909,6 +911,9 @@ fi ...@@ -909,6 +911,9 @@ fi
%endif %endif
%changelog %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 * Thu Jun 26 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-2
- Resolve embedded-devel conflict issue - Resolve embedded-devel conflict issue
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment