[gentoo-commits] proj/mysql:master commit in: eclass/

["Brian Evans" <grknight@lavabit.com>]

commit:     909ea6f0ee0bb3b54aef62b8bed06798af620e88
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Sat Aug 10 15:02:30 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Sat Aug 10 15:02:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=909ea6f0

Initial commit on a multilib eclass based on the cmake builds.
May need some housekeeping but it works.

---
 eclass/mysql-cmake-multilib.eclass | 460 +++++++++++++++++++++++++++++++++++++
 eclass/mysql-v2.eclass             |   5 +-
 2 files changed, 464 insertions(+), 1 deletion(-)

diff --git a/eclass/mysql-cmake-multilib.eclass b/eclass/mysql-cmake-multilib.eclass
new file mode 100644
index 0000000..70e7169
--- /dev/null
+++ b/eclass/mysql-cmake-multilib.eclass
@@ -0,0 +1,460 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: mysql-cmake-multilib.eclass
+# @MAINTAINER:
+# Maintainers:
+#	- MySQL Team <mysql-bugs@gentoo.org>
+#	- Robin H. Johnson <robbat2@gentoo.org>
+#	- Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+# @BLURB: This eclass provides the support for cmake based mysql releases
+# @DESCRIPTION:
+# The mysql-cmake-multilib.eclass provides the support to build the mysql
+# ebuilds using the cmake build system. This eclass provides
+# the src_unpack, src_prepare, src_configure, src_compile, scr_install,
+# pkg_preinst, pkg_postinst, pkg_config and pkg_postrm phase hooks.
+
+inherit cmake-multilib flag-o-matic multilib prefix
+
+#
+# HELPER FUNCTIONS:
+#
+
+# @FUNCTION: mysql_cmake_disable_test
+# @DESCRIPTION:
+# Helper function to disable specific tests.
+mysql-cmake-multilib_disable_test() {
+
+	local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir
+	rawtestname="${1}" ; shift
+	reason="${@}"
+	ewarn "test '${rawtestname}' disabled: '${reason}'"
+
+	testsuite="${rawtestname/.*}"
+	testname="${rawtestname/*.}"
+	for mysql_disabled_file in \
+		${S}/mysql-test/disabled.def  \
+		${S}/mysql-test/t/disabled.def ; do
+		[[ -f ${mysql_disabled_file} ]] && break
+	done
+	#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
+	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
+	echo ${testname} : ${reason} >> "${mysql_disabled_file}"
+
+	if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
+		for mysql_disabled_file in \
+			${S}/mysql-test/suite/${testsuite}/disabled.def  \
+			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
+			FAILED ; do
+			[[ -f ${mysql_disabled_file} ]] && break
+		done
+		if [[ ${mysql_disabled_file} != "FAILED" ]]; then
+			echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
+		else
+			for mysql_disabled_dir in \
+				${S}/mysql-test/suite/${testsuite} \
+				${S}/mysql-test/suite/${testsuite}/t  \
+				FAILED ; do
+				[[ -d ${mysql_disabled_dir} ]] && break
+			done
+			if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
+				echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def"
+			else
+				ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
+			fi
+		fi
+	fi
+}
+
+# @FUNCTION: configure_cmake_locale
+# @DESCRIPTION:
+# Helper function to configure locale cmake options
+configure_cmake_locale() {
+
+	if ! use minimal && [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+		ewarn "You MUST file bugs without these variables set."
+
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+		)
+
+	elif ! use latin1 ; then
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=utf8
+			-DDEFAULT_COLLATION=utf8_general_ci
+		)
+	else
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=latin1
+			-DDEFAULT_COLLATION=latin1_swedish_ci
+		)
+	fi
+}
+
+# @FUNCTION: configure_cmake_minimal
+# @DESCRIPTION:
+# Helper function to configure minimal build
+configure_cmake_minimal() {
+
+	mycmakeargs+=(
+		-DWITHOUT_SERVER=1
+		-DWITHOUT_EMBEDDED_SERVER=1
+		-DENABLED_LOCAL_INFILE=1
+		-DEXTRA_CHARSETS=none
+		-DINSTALL_SQLBENCHDIR=
+		-DWITH_SSL=system
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DWITH_READLINE=0
+		-DWITH_LIBEDIT=0
+		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
+		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
+		-DWITHOUT_CSV_STORAGE_ENGINE=1
+		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+		-DWITHOUT_HEAP_STORAGE_ENGINE=1
+		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
+		-DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1
+		-DWITHOUT_MYISAM_STORAGE_ENGINE=1
+		-DWITHOUT_PARTITION_STORAGE_ENGINE=1
+		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
+	)
+}
+
+# @FUNCTION: configure_cmake_standard
+# @DESCRIPTION:
+# Helper function to configure standard build
+configure_cmake_standard() {
+
+	mycmakeargs+=(
+		-DENABLED_LOCAL_INFILE=1
+		-DEXTRA_CHARSETS=all
+		-DMYSQL_USER=mysql
+		-DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
+		-DWITH_READLINE=0
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+	)
+
+	mycmakeargs+=(
+		$(cmake-utils_use_disable !static SHARED)
+		$(cmake-utils_use_with debug)
+		$(cmake-utils_use_with embedded EMBEDDED_SERVER)
+		$(cmake-utils_use_with profiling)
+		$(cmake-utils_use_enable systemtap DTRACE)
+	)
+
+	if use ssl; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	if use jemalloc; then
+		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+	fi
+
+	if use tcmalloc; then
+		mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+	fi
+
+	# Storage engines
+	mycmakeargs+=(
+		-DWITH_ARCHIVE_STORAGE_ENGINE=1
+		-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+		-DWITH_CSV_STORAGE_ENGINE=1
+		-DWITH_HEAP_STORAGE_ENGINE=1
+		-DWITH_INNOBASE_STORAGE_ENGINE=1
+		-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+		-DWITH_MYISAM_STORAGE_ENGINE=1
+		-DWITH_PARTITION_STORAGE_ENGINE=1
+		$(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE)
+	)
+
+	if pbxt_available ; then
+		mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) )
+	fi
+
+	if [[ ${PN} == "mariadb" ]]; then
+		mycmakeargs+=(
+			$(cmake-utils_use_with oqgraph OQGRAPH_STORAGE_ENGINE)
+			$(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE)
+			$(cmake-utils_use_with extraengine FEDERATEDX_STORAGE_ENGINE)
+		)
+
+		if ! use pam ; then
+			mycmakeargs+=( -DAUTH_PAM_DISABLED=1 )
+		fi
+	fi
+
+	if [[ ${PN} == "percona-server" ]]; then
+		mycmakeargs+=(
+			$(cmake-utils_use_with pam)
+		)
+	fi
+
+	if [[ ${PN} == "mysql-cluster" ]]; then
+		# TODO: This really should include the following options,
+		# but the memcached package doesn't install the files it seeks.
+		# -DWITH_BUNDLED_MEMCACHED=OFF
+		# -DMEMCACHED_HOME=${EPREFIX}/usr
+		mycmakeargs+=(
+			-DWITH_BUNDLED_LIBEVENT=OFF
+			$(cmake-utils_use_with java NDB_JAVA)
+		)
+	fi
+}
+
+#
+# EBUILD FUNCTIONS
+#
+
+# @FUNCTION: mysql-cmake-multilib_src_prepare
+# @DESCRIPTION:
+# Apply patches to the source code and remove unneeded bundled libs.
+mysql-cmake-multilib_src_prepare() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	cd "${S}"
+
+	# Apply the patches for this MySQL version
+	EPATCH_SUFFIX="patch"
+	mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch directory"
+	# Clean out old items
+	rm -f "${EPATCH_SOURCE}"/*
+	# Now link in right patches
+	mysql_mv_patches
+	# And apply
+	epatch
+
+	# last -fPIC fixup, per bug #305873
+	i="${S}"/storage/innodb_plugin/plug.in
+	[[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
+
+	rm -f "scripts/mysqlbug"
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	if use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+	epatch_user
+}
+
+_cmake-multilib_src_configure() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
+		-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
+		-DSYSCONFDIR=${EPREFIX}/etc/mysql
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${P}
+		-DINSTALL_DOCREADMEDIR=share/doc/${P}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)/mysql
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_SQLBENCHDIR=share/mysql
+		-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		$(cmake-utils_use_with test UNIT_TESTS)
+	)
+
+	# Bug 412851
+	# MariaDB requires this flag to compile with GPLv3 readline linked
+	# Adds a warning about redistribution to configure
+	if [[ ${PN} == "mariadb" ]] ; then
+		mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 )
+	fi
+
+	configure_cmake_locale
+	
+	if multilib_is_native_abi; then
+		if use minimal ; then
+			configure_cmake_minimal
+		else
+			configure_cmake_standard
+		fi
+	else
+		configure_cmake_minimal
+	fi
+
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
+	# Causes linkage failures.  Upstream bug #59607 removes it
+	if ! mysql_version_is_at_least "5.6" ; then
+		CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+	fi
+	# As of 5.7, exceptions are used!
+	if ! mysql_version_is_at_least "5.7" ; then
+		CXXFLAGS="${CXXFLAGS} -fno-exceptions"
+	fi
+	export CXXFLAGS
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	cmake-utils_src_configure
+}
+
+# @FUNCTION: mysql-cmake-multilib_src_configure
+# @DESCRIPTION:
+# Configure mysql to build the code for Gentoo respecting the use flags.
+mysql-cmake-multilib_src_configure() {
+	multilib_parallel_foreach_abi _cmake-multilib_src_configure "${@}"
+}
+
+_cmake-multilib_src_compile() {
+	if ! multilib_is_native_abi; then
+		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile
+	else
+		cmake-utils_src_compile
+	fi
+}
+
+# @FUNCTION: mysql-cmake-multilib_src_compile
+# @DESCRIPTION:
+# Compile the mysql code.
+mysql-cmake-multilib_src_compile() {
+
+	debug-print-function ${FUNCNAME} "$@"
+
+	multilib_foreach_abi _cmake-multilib_src_compile "${@}"
+}
+
+_mysql-cmake-multilib_src_install() {
+	
+	debug-print-function ${FUNCNAME} "$@"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	if ! multilib_is_native_abi; then
+		BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install
+		return
+	fi
+	cmake-utils_src_install
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# Create a mariadb_config symlink
+	[[ ${PN} == "mariadb" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	rm -Rf "${ED}/usr/data"
+
+	# Various junk (my-*.cnf moved elsewhere)
+	einfo "Removing duplicate /usr/share/mysql files"
+
+	# Clean up stuff for a minimal build
+#	if use minimal ; then
+#		einfo "Remove all extra content for minimal build"
+#		rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
+#		rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
+#		rm -f "${ED}/usr/sbin/mysqld"
+#		rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+#	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
+	fi
+
+	# Configuration stuff
+	case ${MYSQL_PV_MAJOR} in
+		5.[1-4]*) mysql_mycnf_version="5.1" ;;
+		5.[5-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.5" ;;
+	esac
+	einfo "Building default my.cnf (${mysql_mycnf_version})"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	doins scripts/mysqlaccess.conf
+	mycnf_src="my.cnf-${mysql_mycnf_version}"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR}/${mycnf_src}" \
+		> "${TMPDIR}/my.cnf.ok"
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8|latin1|g" \
+			"${TMPDIR}/my.cnf.ok"
+	fi
+	eprefixify "${TMPDIR}/my.cnf.ok"
+	newins "${TMPDIR}/my.cnf.ok" my.cnf
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		einfo "Creating initial directories"
+		# Empty directories ...
+		diropts "-m0750"
+		if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
+			dodir "${MY_DATADIR#${EPREFIX}}"
+			keepdir "${MY_DATADIR#${EPREFIX}}"
+			chown -R mysql:mysql "${D}/${MY_DATADIR}"
+		fi
+
+		diropts "-m0755"
+		for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
+			dodir "${folder}"
+			keepdir "${folder}"
+			chown -R mysql:mysql "${ED}/${folder}"
+		done
+	fi
+
+	# Minimal builds don't have the MySQL server
+	if ! use minimal ; then
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		for script in \
+			"${S}"/support-files/my-*.cnf.sh \
+			"${S}"/support-files/magic \
+			"${S}"/support-files/ndb-config-2-node.ini.sh
+		do
+			[[ -f $script ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}"
+		done
+	fi
+
+	cat <<-EOF > "${T}"/80mysql-libdir
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql"
+	EOF
+	doenvd "${T}"/80mysql-libdir
+
+	#Remove mytop if perl is not selected
+	[[ ${PN} == "mariadb" ]] && ! use perl \
+	&& rm -f "${ED}/usr/bin/mytop"
+}
+
+# @FUNCTION: mysql-cmake-multilib_src_install
+# @DESCRIPTION:
+# Install mysql.
+mysql-cmake-multilib_src_install() {
+	multilib_foreach_abi _mysql-cmake-multilib_src_install "${@}"
+}

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 8e6ba99..81e5b56 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -27,6 +27,9 @@ case ${BUILD} in
 	"cmake")
 		BUILD_INHERIT="mysql-cmake"
 		;;
+	"cmake-multilib")
+		BUILD_INHERIT="mysql-cmake-multilib"
+		;;
 	"autotools")
 		BUILD_INHERIT="mysql-autotools"
 
@@ -185,7 +188,7 @@ case "${BUILD}" in
 	"autotools")
 		IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
 		;;
-	"cmake")
+	"cmake"*)
 		IUSE="debug embedded minimal +perl selinux ssl static test"
 		;;
 esac