From 67896a3db20e7816e7b7a322cb1a7efad83cb2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 15 Jul 2015 14:41:57 +0200 Subject: [PATCH] Tweak some cmake switches to enable more things Both mysql/mariadb: WITH_ASAN=ON adress sanitization WITH_LIBWRAP=ON tcp wrappers Mysql only: ENABLED_PROFILING=OFF profiling disable ENABLE_DEBUG_SYNC=OFF debug testing sync disable WITH_PIC=ON by default we want pic generated binaries --- common/mysql.spec.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/common/mysql.spec.in b/common/mysql.spec.in index dbb615f..013ca65 100644 --- a/common/mysql.spec.in +++ b/common/mysql.spec.in @@ -352,6 +352,11 @@ EXTRA_FLAGS="${EXTRA_FLAGS} -Wno-error" export CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS" export CXXFLAGS="$CFLAGS -felide-constructors" %cmake -DWITH_SSL=system \ + -DWITH_ASAN=ON \ + -DWITH_LIBWRAP=ON \ + -DENABLED_PROFILING=OFF \ + -DENABLE_DEBUG_SYNC=OFF \ + -DWITH_PIC=ON \ -DWITH_ZLIB=system \ -DWITH_LIBEVENT=system \ -DWITH_JEMALLOC=auto \ @@ -359,7 +364,7 @@ export CXXFLAGS="$CFLAGS -felide-constructors" -DWITH_LIBEDIT=0 \ -DWITH_EDITLINE=system \ -DINSTALL_LAYOUT=RPM \ - -DMYSQL_UNIX_ADDR="%{_localstatedir}/run/mysql/mysql.sock" \ + -DMYSQL_UNIX_ADDR="%{_localstatedir}/run/mysql/mysql.sock" \ -DINSTALL_UNIX_ADDRDIR="%{_localstatedir}/run/mysql/mysql.sock" \ -DINSTALL_MYSQLSHAREDIR=share/%{name} \ -DWITH_COMMENT="openSUSE MySQL rpm" \ @@ -384,7 +389,8 @@ export CXXFLAGS="$CFLAGS -felide-constructors" -DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$CFLAGS" \ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$CXXFLAGS" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo -DINSTALL_SQLBENCHDIR=share \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DINSTALL_SQLBENCHDIR=share \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \