summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2014-04-07 16:36:09 +0200
committerBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2014-04-07 16:36:09 +0200
commitc5f8d2587a3e3a38ebe62b08e4cada0e8f84ee4d (patch)
treebf1676f1c812f21e520b85cd1722fa55c99b37a3 /packaging
parentb2e66814b4ba860f464c9217c5f8c45fb254a089 (diff)
downloadmariadb-git-c5f8d2587a3e3a38ebe62b08e4cada0e8f84ee4d.tar.gz
updated optflags variable and cmake option for debug build
Diffstat (limited to 'packaging')
-rw-r--r--packaging/rpm-oel/mysql.spec.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in
index 2dc71b4c40d..44b387bbebf 100644
--- a/packaging/rpm-oel/mysql.spec.in
+++ b/packaging/rpm-oel/mysql.spec.in
@@ -468,12 +468,13 @@ mkdir debug
(
cd debug
# Attempt to remove any optimisation flags from the debug build
- CFLAGS=$(echo "${CFLAGS}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
- CXXFLAGS=$(echo "${CFLAGS}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
+ optflags=$(echo "%{optflags}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
cmake ../%{src_dir} \
-DBUILD_CONFIG=mysql_release \
-DINSTALL_LAYOUT=RPM \
-DCMAKE_BUILD_TYPE=Debug %{?el7:-DENABLE_DTRACE=OFF} \
+ -DCMAKE_C_FLAGS="$optflags" \
+ -DCMAKE_CXX_FLAGS="$optflags" \
-DINSTALL_LIBDIR="%{_lib}/mysql" \
-DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
-DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \