From ab37849b10b79ddf138c98a8b258d0fc9d5be9cd Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 5 Jun 2014 09:59:39 +0000 Subject: [PATCH] - cleanup --- mysql.spec | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/mysql.spec b/mysql.spec index 521fa82..1e6435d 100644 --- a/mysql.spec +++ b/mysql.spec @@ -82,11 +82,7 @@ URL: http://www.mysql.com/products/community/ BuildRequires: bison >= 1.875 BuildRequires: cmake >= 2.6 BuildRequires: readline-devel >= 6.2 -%if "%{pld_release}" == "ac" -BuildRequires: libstdc++4-devel >= 5:4.0 -%else BuildRequires: libstdc++-devel >= 5:4.0 -%endif BuildRequires: automake %{?with_tcpd:BuildRequires: libwrap-devel} BuildRequires: ncurses-devel >= 4.2 @@ -536,13 +532,6 @@ cd build # (it defaults to first cluster but user may change it to whatever # cluster it wants) -%if "%{pld_release}" == "ac" -# add suffix, but allow ccache, etc in ~/.rpmmacros -%{expand:%%define __cc %(echo '%__cc' | sed -e 's,-gcc,-gcc4,')} -%{expand:%%define __cxx %(echo '%__cxx' | sed -e 's,-g++,-g++4,')} -%{expand:%%define __cpp %(echo '%__cpp' | sed -e 's,-gcc,-gcc4,')} -%endif - %cmake \ -DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \ -DCMAKE_C_FLAGS_RELEASE="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \ @@ -566,11 +555,7 @@ cd build -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ -DWITH_PIC=ON \ -DWITH_EDITLINE=system \ -%if "%{pld_release}" == "ac" - -DWITH_SSL=%{?with_ssl:bundled}%{!?with_ssl:no} \ -%else -DWITH_SSL=%{?with_ssl:system}%{!?with_ssl:no} \ -%endif -DWITH_UNIT_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \ -DWITH_ZLIB=system \ .. -- 2.44.0