/[gentoo-x86]/eclass/mysql-cmake.eclass
Gentoo

Diff of /eclass/mysql-cmake.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.13 Revision 1.15
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2013 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.13 2013/01/20 02:37:51 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.15 2013/03/04 19:10:31 robbat2 Exp $
4 4
5# @ECLASS: mysql-cmake.eclass 5# @ECLASS: mysql-cmake.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Maintainers: 7# Maintainers:
8# - MySQL Team <mysql-bugs@gentoo.org> 8# - MySQL Team <mysql-bugs@gentoo.org>
183 mycmakeargs+=( 183 mycmakeargs+=(
184 $(cmake-utils_use_with oqgraph OQGRAPH_STORAGE_ENGINE) 184 $(cmake-utils_use_with oqgraph OQGRAPH_STORAGE_ENGINE)
185 $(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE) 185 $(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE)
186 $(cmake-utils_use_with extraengine FEDERATEDX_STORAGE_ENGINE) 186 $(cmake-utils_use_with extraengine FEDERATEDX_STORAGE_ENGINE)
187 ) 187 )
188
189 if ! use pam ; then
190 mycmakeargs+=( -DAUTH_PAM_DISABLED=1 )
191 fi
192
188 fi 193 fi
189} 194}
190 195
191# 196#
192# EBUILD FUNCTIONS 197# EBUILD FUNCTIONS
214 # last -fPIC fixup, per bug #305873 219 # last -fPIC fixup, per bug #305873
215 i="${S}"/storage/innodb_plugin/plug.in 220 i="${S}"/storage/innodb_plugin/plug.in
216 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" 221 [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
217 222
218 rm -f "scripts/mysqlbug" 223 rm -f "scripts/mysqlbug"
224 epatch_user
219} 225}
220 226
221# @FUNCTION: mysql-cmake_src_configure 227# @FUNCTION: mysql-cmake_src_configure
222# @DESCRIPTION: 228# @DESCRIPTION:
223# Configure mysql to build the code for Gentoo respecting the use flags. 229# Configure mysql to build the code for Gentoo respecting the use flags.
268 # Bug #114895, bug #110149 274 # Bug #114895, bug #110149
269 filter-flags "-O" "-O[01]" 275 filter-flags "-O" "-O[01]"
270 276
271 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" 277 CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
272 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" 278 CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
279 # Causes linkage failures. Upstream bug #59607 removes it
280 if ! mysql_version_is_at_least "5.6" ; then
273 CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" 281 CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
282 fi
274 export CXXFLAGS 283 export CXXFLAGS
275 284
276 # bug #283926, with GCC4.4, this is required to get correct behavior. 285 # bug #283926, with GCC4.4, this is required to get correct behavior.
277 append-flags -fno-strict-aliasing 286 append-flags -fno-strict-aliasing
278 287
386 done 395 done
387 396
388 fi 397 fi
389 398
390 mysql_lib_symlinks "${ED}" 399 mysql_lib_symlinks "${ED}"
400
401 #Remove mytop if perl is not selected
402 [[ "${PN}" == "mariadb" ]] && ! use perl \
403 && rm -f "${ED}/usr/bin/mytop"
391} 404}

Legend:
Removed from v.1.13  
changed lines
  Added in v.1.15

  ViewVC Help
Powered by ViewVC 1.1.20