public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2014-07-31  2:31 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2014-07-31  2:31 UTC (permalink / raw
  To: gentoo-commits

grknight    14/07/31 02:31:09

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Update the multilib eclass to match the work done by grobian for mysql-v2

Revision  Changes    Path
1.1334               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1334&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1334&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1333&r2=1.1334

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1333
retrieving revision 1.1334
diff -u -r1.1333 -r1.1334
--- ChangeLog	30 Jul 2014 19:49:46 -0000	1.1333
+++ ChangeLog	31 Jul 2014 02:31:09 -0000	1.1334
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1333 2014/07/30 19:49:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1334 2014/07/31 02:31:09 grknight Exp $
+
+  31 Jul 2014; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Update the multilib eclass to match the work done by grobian for mysql-v2
+  for prefix.
 
   30 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> udev.eclass:
   Deprecate the longer udev_get_udevdir() function in favour of the shorter



1.3                  eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.2&r2=1.3

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysql-multilib.eclass	29 Jul 2014 20:24:00 -0000	1.2
+++ mysql-multilib.eclass	31 Jul 2014 02:31:09 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.2 2014/07/29 20:24:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.3 2014/07/31 02:31:09 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -641,7 +641,7 @@
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -692,11 +692,11 @@
 	MYSQL_LOG_BIN="$(mysql-multilib_getoptval mysqld log-bin)"
 	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
 
-	if [[ ! -d "${EROOT}"/$MYSQL_TMPDIR ]]; then
+	if [[ ! -d "${ROOT}"/$MYSQL_TMPDIR ]]; then
 		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
 		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_TMPDIR
 	fi
-	if [[ ! -d "${EROOT}"/$MYSQL_LOG_BIN ]]; then
+	if [[ ! -d "${ROOT}"/$MYSQL_LOG_BIN ]]; then
 		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
 		install -d -m 770 -o mysql -g mysql "${EROOT}"/$MYSQL_LOG_BIN
 	fi
@@ -718,8 +718,8 @@
 
 	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
 
-		einfo "Please provide a password for the mysql 'root' user now, in the"
-		einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
+		einfo "Please provide a password for the mysql 'root' user now"
+		einfo "or through the ${HOME}/.my.cnf file."
 		ewarn "Avoid [\"'\\_%] characters in the password"
 		read -rsp "    >" pwd1 ; echo
 
@@ -733,9 +733,13 @@
 		unset pwd1 pwd2
 	fi
 
-	local options="--log-warnings=0"
+	local options
 	local sqltmp="$(emktemp)"
 
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
+
 	local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
 	[[ -r "${help_tables}" ]] \
 	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
@@ -758,10 +762,6 @@
 
 	use prefix || options="${options} --user=mysql"
 
-	# Fix bug 446200. Don't reference host my.cnf
-	use prefix && [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] \
-		&& options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
 	# MySQL 5.6+ needs InnoDB
 	if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
 		mysql_version_is_at_least "5.6" || options="${options} --loose-skip-innodb"
@@ -782,7 +782,7 @@
 	#cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
 	cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
 	[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
-	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'"
+	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}'"
 	einfo "Command: $cmd"
 	eval $cmd \
 		>"${TMPDIR}"/mysql_install_db.log 2>&1
@@ -808,16 +808,16 @@
 	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
 	local mysqld="${EROOT}/usr/sbin/mysqld \
 		${options} \
-		--user=mysql \
+		$(use prefix || echo --user=mysql) \
 		--log-warnings=0 \
 		--basedir=${EROOT}/usr \
-		--datadir=${EROOT}/${MY_DATADIR} \
+		--datadir=${ROOT}/${MY_DATADIR} \
 		--max_allowed_packet=8M \
 		--net_buffer_length=16K \
 		--default-storage-engine=MyISAM \
 		--socket=${socket} \
 		--pid-file=${pidfile}
-		--tmpdir=${EROOT}/${MYSQL_TMPDIR}"
+		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
 	#einfo "About to start mysqld: ${mysqld}"
 	ebegin "Starting mysqld"
 	einfo "Command ${mysqld}"





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2014-08-17 22:50 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2014-08-17 22:50 UTC (permalink / raw
  To: gentoo-commits

grknight    14/08/17 22:50:23

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Move ENABLE_DTRACE check to the multilib_src_configure wrt bug 520028

Revision  Changes    Path
1.1353               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1353&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1353&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1352&r2=1.1353

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1352
retrieving revision 1.1353
diff -u -r1.1352 -r1.1353
--- ChangeLog	17 Aug 2014 03:34:32 -0000	1.1352
+++ ChangeLog	17 Aug 2014 22:50:23 -0000	1.1353
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1352 2014/08/17 03:34:32 jcallen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1353 2014/08/17 22:50:23 grknight Exp $
+
+  18 Aug 2014; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Move ENABLE_DTRACE check to the multilib_src_configure wrt bug 520028
 
   17 Aug 2014; Jonathan Callen <jcallen@gentoo.org> multilib-build.eclass:
   Add new multilib_native_enable and multilib_native_with functions; fix



1.5                  eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.4&r2=1.5

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mysql-multilib.eclass	31 Jul 2014 22:26:07 -0000	1.4
+++ mysql-multilib.eclass	17 Aug 2014 22:50:23 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.4 2014/07/31 22:26:07 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.5 2014/08/17 22:50:23 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -448,6 +448,7 @@
 		-DWITH_SSL=$(usex ssl system bundled)
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
+		$(cmake-utils_use_enable systemtap DTRACE)
 	)
 
 	if in_iuse bindist ; then





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2014-08-29 18:50 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2014-08-29 18:50 UTC (permalink / raw
  To: gentoo-commits

grknight    14/08/29 18:50:39

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Sync mysql-multilib.eclass from mysql overlay

Revision  Changes    Path
1.1359               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1359&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1359&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1358&r2=1.1359

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1358
retrieving revision 1.1359
diff -u -r1.1358 -r1.1359
--- ChangeLog	28 Aug 2014 18:20:49 -0000	1.1358
+++ ChangeLog	29 Aug 2014 18:50:39 -0000	1.1359
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1358 2014/08/28 18:20:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1359 2014/08/29 18:50:39 grknight Exp $
+
+  30 Aug 2014; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Fix percona-server SRC_URI, add missing dep on mariadb-galera for rsync sst,
+  Add future deps for packages.
 
   28 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-policy-2.eclass:
   Simplify rlpkg call and optimize package relabeling thanks to Jason Perfinion



1.6                  eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.5&r2=1.6

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mysql-multilib.eclass	17 Aug 2014 22:50:23 -0000	1.5
+++ mysql-multilib.eclass	29 Aug 2014 18:50:39 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.5 2014/08/17 22:50:23 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.6 2014/08/29 18:50:39 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -73,7 +73,8 @@
 # MariaDB has left the numbering schema but keeping compatibility
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
 	case ${PV} in
-		10.0*|10.1*) MYSQL_PV_MAJOR="5.6" ;;
+		10.0*) MYSQL_PV_MAJOR="5.6" ;;
+		10.1*) MYSQL_PV_MAJOR="5.7" ;;
 	esac
 fi
 
@@ -135,7 +136,7 @@
 		MY_PV=$(get_version_component_range 1-3 ${PV})
 		PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV})
 		PERCONA_RC=$(get_version_component_range 6 ${PV})
-		SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz"
+		SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz"
 #		http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-rel30.2.tar.gz
 #		http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz
 	else
@@ -246,6 +247,10 @@
 	DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )"
 fi
 
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
+	mysql_version_is_at_least "5.7.5" && DEPEND="${DEPEND} dev-libs/boost:0="
+fi
+
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 	# Bug 441700 MariaDB >=5.3 include custom mytop
 	DEPEND="${DEPEND}
@@ -259,11 +264,11 @@
 			"
 	fi
 	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )"
-	if mysql_version_is_at_least "10.0.9" ; then
-		DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
-	fi
+	mysql_version_is_at_least "10.0.9" && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3="
 fi
 
+[[ ${PN} == "percona-server" ]] && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam:0= ) )"
+
 # Having different flavours at the same time is not a good idea
 for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; do
 	[[ ${i} == ${PN} ]] ||
@@ -298,8 +303,11 @@
 	# The wsrep API version must match between the ebuild and sys-cluster/galera.
 	# This will be indicated by WSREP_REVISION in the ebuild and the first number
 	# in the version of sys-cluster/galera
+	#
+	# lsof is required as of 5.5.38 and 10.0.11 for the rsync sst
 	RDEPEND="${RDEPEND}
 		=sys-cluster/galera-${WSREP_REVISION}*
+		sys-process/lsof
 	"
 fi
 
@@ -323,6 +331,9 @@
 # my_config.h includes ABI specific data
 MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h )
 
+# wrap the config script
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
 #
 # HELPER FUNCTIONS:
 #





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2014-09-03 13:05 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2014-09-03 13:05 UTC (permalink / raw
  To: gentoo-commits

grknight    14/09/03 13:05:50

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Fix libedit MULTILIB_USEDEP wrt bug 521964

Revision  Changes    Path
1.1363               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1363&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1363&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1362&r2=1.1363

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1362
retrieving revision 1.1363
diff -u -r1.1362 -r1.1363
--- ChangeLog	2 Sep 2014 15:28:05 -0000	1.1362
+++ ChangeLog	3 Sep 2014 13:05:50 -0000	1.1363
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1362 2014/09/02 15:28:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1363 2014/09/03 13:05:50 grknight Exp $
+
+  03 Sep 2014; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Fix libedit MULTILIB_USEDEP wrt bug 521964
 
   02 Sep 2014; Michał Górny <mgorny@gentoo.org> bash-completion-r1.eclass:
   Add bashcomp_alias function to create command aliases for completion.



1.7                  eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.6&r2=1.7

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mysql-multilib.eclass	29 Aug 2014 18:50:39 -0000	1.6
+++ mysql-multilib.eclass	3 Sep 2014 13:05:50 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.6 2014/08/29 18:50:39 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.7 2014/09/03 13:05:50 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -240,9 +240,9 @@
 # This probably could be simplified
 if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \
 	mysql_version_is_at_least "5.6.12" ; then
-	DEPEND="${DEPEND} dev-libs/libedit"
+	DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]"
 elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then
-	DEPEND="${DEPEND} dev-libs/libedit"
+	DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]"
 else
 	DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )"
 fi





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2014-09-26 17:49 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2014-09-26 17:49 UTC (permalink / raw
  To: gentoo-commits

grknight    14/09/26 17:49:11

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Adjust deps for >=mariadb-10.0.14 and add USE base deps for mariadb-galera

Revision  Changes    Path
1.1375               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1375&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1375&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1374&r2=1.1375

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1374
retrieving revision 1.1375
diff -u -r1.1374 -r1.1375
--- ChangeLog	22 Sep 2014 00:03:25 -0000	1.1374
+++ ChangeLog	26 Sep 2014 17:49:11 -0000	1.1375
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1374 2014/09/22 00:03:25 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1375 2014/09/26 17:49:11 grknight Exp $
+
+  26 Sep 2014; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Adjust deps for >=mariadb-10.0.14 and add USE base deps for mariadb-galera
 
   22 Sep 2014; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass,
   qt5-build.eclass:



1.8                  eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.7&r2=1.8

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mysql-multilib.eclass	3 Sep 2014 13:05:50 -0000	1.7
+++ mysql-multilib.eclass	26 Sep 2014 17:49:11 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.7 2014/09/03 13:05:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.8 2014/09/26 17:49:11 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -188,7 +188,8 @@
 	+perl profiling selinux ssl systemtap static static-libs tcmalloc test"
 
 # This probably could be simplified, but the syntax would have to be just right
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \
+        mysql_check_version_range "5.5.37 to 10.0.13.99" ; then
 	IUSE="bindist ${IUSE}"
 elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \
 	mysql_check_version_range "5.5.37 to 5.6.11.99" ; then
@@ -206,6 +207,10 @@
 	REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )"
 fi
 
+if [[ ${PN} == "mariadb-galera" ]]; then
+	IUSE="${IUSE} +sst_rsync sst_xtrabackup"
+fi
+
 if [[ ${PN} == "percona-server" ]]; then
 	IUSE="${IUSE} pam"
 fi
@@ -237,12 +242,16 @@
 "
 
 # dev-db/mysql-5.6.12+ only works with dev-libs/libedit
+# mariadb 10.0.14 fixes libedit detection. changed to follow mysql
 # This probably could be simplified
 if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \
 	mysql_version_is_at_least "5.6.12" ; then
 	DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]"
 elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then
 	DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]"
+elif [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \
+	mysql_version_is_at_least "10.0.14" ; then
+	DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]"
 else
 	DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )"
 fi
@@ -306,8 +315,13 @@
 	#
 	# lsof is required as of 5.5.38 and 10.0.11 for the rsync sst
 	RDEPEND="${RDEPEND}
+		sys-apps/iproute2
 		=sys-cluster/galera-${WSREP_REVISION}*
-		sys-process/lsof
+		sst_rsync? ( sys-process/lsof )
+		sst_xtrabackup? (
+			dev-db/xtrabackup-bin
+			net-misc/socat[ssl]
+		)
 	"
 fi
 





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2014-09-26 17:56 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2014-09-26 17:56 UTC (permalink / raw
  To: gentoo-commits

grknight    14/09/26 17:56:29

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Change IUSE for mariadb-galera to valid values

Revision  Changes    Path
1.1376               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1376&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1376&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1375&r2=1.1376

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1375
retrieving revision 1.1376
diff -u -r1.1375 -r1.1376
--- ChangeLog	26 Sep 2014 17:49:11 -0000	1.1375
+++ ChangeLog	26 Sep 2014 17:56:29 -0000	1.1376
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1375 2014/09/26 17:49:11 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1376 2014/09/26 17:56:29 grknight Exp $
+
+  26 Sep 2014; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Fix up invalid general IUSE with underscores
 
   26 Sep 2014; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
   Adjust deps for >=mariadb-10.0.14 and add USE base deps for mariadb-galera



1.9                  eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.8&r2=1.9

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mysql-multilib.eclass	26 Sep 2014 17:49:11 -0000	1.8
+++ mysql-multilib.eclass	26 Sep 2014 17:56:29 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.8 2014/09/26 17:49:11 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.9 2014/09/26 17:56:29 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -208,7 +208,7 @@
 fi
 
 if [[ ${PN} == "mariadb-galera" ]]; then
-	IUSE="${IUSE} +sst_rsync sst_xtrabackup"
+	IUSE="${IUSE} +sst-rsync sst-xtrabackup"
 fi
 
 if [[ ${PN} == "percona-server" ]]; then
@@ -317,8 +317,8 @@
 	RDEPEND="${RDEPEND}
 		sys-apps/iproute2
 		=sys-cluster/galera-${WSREP_REVISION}*
-		sst_rsync? ( sys-process/lsof )
-		sst_xtrabackup? (
+		sst-rsync? ( sys-process/lsof )
+		sst-xtrabackup? (
 			dev-db/xtrabackup-bin
 			net-misc/socat[ssl]
 		)





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2015-02-08 22:03 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2015-02-08 22:03 UTC (permalink / raw
  To: gentoo-commits

grknight    15/02/08 22:03:56

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Fix dependency on ncurses for bug 539354 and restructure to remove user confusion with the xml flag for mariadb

Revision  Changes    Path
1.1523               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1523&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1523&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1522&r2=1.1523

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1522
retrieving revision 1.1523
diff -u -r1.1522 -r1.1523
--- ChangeLog	5 Feb 2015 23:28:17 -0000	1.1522
+++ ChangeLog	8 Feb 2015 22:03:56 -0000	1.1523
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1522 2015/02/05 23:28:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1523 2015/02/08 22:03:56 grknight Exp $
+
+  08 Feb 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Fix dependency on ncurses for bug 539354 and restructure to remove user
+  confusion with the xml flag for mariadb
 
   05 Feb 2015; Anthony G. Basile <blueness@gentoo.org> toolchain.eclass:
   Restore the old way of dealing with fixed includes for bsd, bug #536878.



1.13                 eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.12&r2=1.13

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mysql-multilib.eclass	28 Jan 2015 13:48:58 -0000	1.12
+++ mysql-multilib.eclass	8 Feb 2015 22:03:56 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.12 2015/01/28 13:48:58 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.13 2015/02/08 22:03:56 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -212,8 +212,7 @@
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
 	IUSE="${IUSE} oqgraph pam sphinx tokudb"
 	# 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or perfomance suffers
-	mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml" && \
-		REQUIRED_USE="odbc? ( extraengine !minimal ) xml? ( extraengine !minimal )"
+	mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml"
 	REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )"
 
 	# MariaDB 10.1 introduces InnoDB/XtraDB compression with external libraries
@@ -239,7 +238,7 @@
 
 REQUIRED_USE="
 	${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
-	 minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )"
+	 minimal? ( !extraengine !embedded ) static? ( !ssl )"
 
 #
 # DEPENDENCIES:
@@ -254,6 +253,7 @@
 		sys-process/procps:0=
 		dev-libs/libaio:0=
 	)
+	sys-libs/ncurses
 	>=sys-apps/sed-4
 	>=sys-apps/texinfo-4.7-r1
 	>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
@@ -300,8 +300,10 @@
 		perl? ( !dev-db/mytop )"
 	if mysql_version_is_at_least "10.0.5" ; then
 		DEPEND="${DEPEND}
-			odbc? ( dev-db/unixODBC:0= )
-			xml? ( dev-libs/libxml2:2= )
+			extraengine? (
+				odbc? ( dev-db/unixODBC:0= )
+				xml? ( dev-libs/libxml2:2= )
+			)
 			"
 	fi
 	mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )"
@@ -375,10 +377,12 @@
 fi
 
 # compile-time-only
+# ncurses only needs multilib for compile time due to a binary that will be not installed
 DEPEND="${DEPEND}
 	virtual/yacc
 	static? ( sys-libs/ncurses[static-libs] )
 	>=dev-util/cmake-2.8.9
+	sys-libs/ncurses[${MULTILIB_USEDEP}]
 "
 
 # For other stuff to bring us in
@@ -431,9 +435,9 @@
 	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
 
 	if use cluster && [[ "${PN}" != "mysql-cluster" ]]; then
-		ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
-		ewarn "5.1 series should NOT be put into production. In the near"
-		ewarn "future, it will be disabled from building."
+		ewarn "The NDB cluster support is no longer built."
+		ewarn "Please use dev-db/mysql-cluster for NDB."
+		ewarn "In the near future, the USE flag will be removed."
 	fi
 
 	if [[ ${PN} == "mysql-cluster" ]] ; then





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2015-02-10 18:14 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2015-02-10 18:14 UTC (permalink / raw
  To: gentoo-commits

grknight    15/02/10 18:14:23

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  mysql-multilib.eclass: Always build NDB with mysql-cluster for libndbclient

Revision  Changes    Path
1.1528               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1528&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1528&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1527&r2=1.1528

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1527
retrieving revision 1.1528
diff -u -r1.1527 -r1.1528
--- ChangeLog	10 Feb 2015 07:22:00 -0000	1.1527
+++ ChangeLog	10 Feb 2015 18:14:23 -0000	1.1528
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1527 2015/02/10 07:22:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1528 2015/02/10 18:14:23 grknight Exp $
+
+  10 Feb 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Always build NDB with mysql-cluster for libndbclient
 
   10 Feb 2015; Justin Lecher <jlec@gentoo.org> toolchain.eclass:
   Revert unreviewed commit which breaks the tree



1.14                 eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.13&r2=1.14

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mysql-multilib.eclass	8 Feb 2015 22:03:56 -0000	1.13
+++ mysql-multilib.eclass	10 Feb 2015 18:14:23 -0000	1.14
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.13 2015/02/08 22:03:56 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.14 2015/02/10 18:14:23 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -393,6 +393,9 @@
 # my_config.h includes ABI specific data
 MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h /usr/include/mysql/private/embedded_priv.h )
 
+[[ ${PN} == "mysql-cluster" ]] && \
+	MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/storage/ndb/ndb_types.h )
+
 [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "10.1.1" && \
 	MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
 
@@ -562,6 +565,11 @@
 		configure_cmake_minimal
 	fi
 
+	# Always build NDB with mysql-cluster for libndbclient
+	[[ ${PN} == "mysql-cluster" ]] && mycmakeargs+=(
+		-DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1
+		-DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
+
 	# Bug #114895, bug #110149
 	filter-flags "-O" "-O[01]"
 





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2015-02-16 17:25 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2015-02-16 17:25 UTC (permalink / raw
  To: gentoo-commits

grknight    15/02/16 17:25:14

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Adjust mysql-cluster-7.3* virtual

Revision  Changes    Path
1.1537               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1537&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1537&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1536&r2=1.1537

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1536
retrieving revision 1.1537
diff -u -r1.1536 -r1.1537
--- ChangeLog	16 Feb 2015 14:37:50 -0000	1.1536
+++ ChangeLog	16 Feb 2015 17:25:14 -0000	1.1537
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1536 2015/02/16 14:37:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1537 2015/02/16 17:25:14 grknight Exp $
+
+  16 Feb 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Adjust mysql-cluster-7.3* virtual
 
   16 Feb 2015; Brian Evans <grknight@gentoo.org> mysql-v2.eclass:
   Silence repoman warnings by providing slots on openssl and readline



1.15                 eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.14&r2=1.15

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mysql-multilib.eclass	10 Feb 2015 18:14:23 -0000	1.14
+++ mysql-multilib.eclass	16 Feb 2015 17:25:14 -0000	1.15
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.14 2015/02/10 18:14:23 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.15 2015/02/16 17:25:14 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -66,7 +66,8 @@
 # Cluster is a special case...
 if [[ "${PN}" == "mysql-cluster" ]]; then
 	case $PV in
-		7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;;
+		7.2*) MYSQL_PV_MAJOR=5.5 ;;
+		7.3*) MYSQL_PV_MAJOR=5.6 ;;
 	esac
 fi
 





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2015-03-17 19:39 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2015-03-17 19:39 UTC (permalink / raw
  To: gentoo-commits

grknight    15/03/17 19:39:43

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Move flag modifications to apply once for all ABIs; Use tc-ld-disable-gold for bug 508724; Move tokudb check to pkg_pretend

Revision  Changes    Path
1.1566               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1566&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1566&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1565&r2=1.1566

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1565
retrieving revision 1.1566
diff -u -r1.1565 -r1.1566
--- ChangeLog	15 Mar 2015 17:23:09 -0000	1.1565
+++ ChangeLog	17 Mar 2015 19:39:43 -0000	1.1566
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1565 2015/03/15 17:23:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1566 2015/03/17 19:39:43 grknight Exp $
+
+  17 Mar 2015; <grknight@gentoo.org> mysql-multilib.eclass:
+  Move flag modifications to apply once for all ABIs; Use tc-ld-disable-gold
+  for bug 508724; Move tokudb check to pkg_pretend
 
   15 Mar 2015; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass:
   Detect dangerous environment variables, bug 543042; support



1.18                 eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.17&r2=1.18

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mysql-multilib.eclass	8 Mar 2015 09:42:19 -0000	1.17
+++ mysql-multilib.eclass	17 Mar 2015 19:39:43 -0000	1.18
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.17 2015/03/08 09:42:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.18 2015/03/17 19:39:43 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -39,7 +39,7 @@
 	*) die "Unsupported EAPI: ${EAPI}" ;;
 esac
 
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config
+EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_config
 
 #
 # VARIABLES:
@@ -291,7 +291,9 @@
 ### End readline/libedit
 
 if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
-	mysql_version_is_at_least "5.7.5" && DEPEND="${DEPEND} >=dev-libs/boost-1.56.0:0="
+	if mysql_version_is_at_least "5.7.6" ; then DEPEND="${DEPEND} >=dev-libs/boost-1.57.0:0=" ; else
+		mysql_version_is_at_least "5.7.5" && DEPEND="${DEPEND} >=dev-libs/boost-1.56.0:0="
+	fi
 fi
 
 if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
@@ -419,6 +421,20 @@
 # EBUILD FUNCTIONS
 #
 
+# @FUNCTION: mysql-multilib_pkg_pretend
+# @DESCRIPTION:
+# Perform some basic tests and tasks during pkg_pretend phase:
+mysql-multilib_pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || \
+			$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then
+			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+	fi
+}
+
 # @FUNCTION: mysql-multilib_pkg_setup
 # @DESCRIPTION:
 # Perform some basic tests and tasks during pkg_setup phase:
@@ -448,14 +464,6 @@
 	if [[ ${PN} == "mysql-cluster" ]] ; then
 		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
 	fi
-
-	if use_if_iuse tokudb && [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 || \
-		$(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then
-		eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
-		eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-		die
-	fi
-
 }
 
 # @FUNCTION: mysql-multilib_src_unpack
@@ -488,6 +496,29 @@
 # @DESCRIPTION:
 # Configure mysql to build the code for Gentoo respecting the use flags.
 mysql-multilib_src_configure() {
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	CXXFLAGS="${CXXFLAGS} -felide-constructors"
+	# 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 -fno-rtti"
+	fi
+	export CXXFLAGS
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	# bug 508724 mariadb cannot use ld.gold
+	if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
+		tc-ld-disable-gold
+	fi
+
 	multilib-minimal_src_configure
 }
 
@@ -572,24 +603,6 @@
 		-DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1
 		-DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
 
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	CXXFLAGS="${CXXFLAGS} -felide-constructors"
-	# 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 -fno-rtti"
-	fi
-	export CXXFLAGS
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
 	cmake-utils_src_configure
 }
 





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2015-06-10 18:08 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2015-06-10 18:08 UTC (permalink / raw
  To: gentoo-commits

grknight    15/06/10 18:08:02

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Resolve cirucular dependency for bug 551686; Make USE=cluster die early for all except dev-db/mysql-cluster; Documentation update for variables, remove 2 unused and add WSREP_REVISION; Clarify mariadb bindist USE

Revision  Changes    Path
1.1651               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1651&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1651&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1650&r2=1.1651

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1650
retrieving revision 1.1651
diff -u -r1.1650 -r1.1651
--- ChangeLog	9 Jun 2015 22:00:44 -0000	1.1650
+++ ChangeLog	10 Jun 2015 18:08:02 -0000	1.1651
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1650 2015/06/09 22:00:44 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1651 2015/06/10 18:08:02 grknight Exp $
+
+  10 Jun 2015; <grknight@gentoo.org> mysql-multilib.eclass:
+  Resolve cirucular dependency for bug 551686; Make USE=cluster die early for
+  all except dev-db/mysql-cluster; Documentation update for variables, remove 2
+  unused and add WSREP_REVISION; Clarify mariadb bindist USE
 
   09 Jun 2015; Michael Weber <xmw@gentoo.org> netsurf.eclass:
   Update for buildsystem-1.3



1.21                 eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.20&r2=1.21

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mysql-multilib.eclass	24 May 2015 04:35:49 -0000	1.20
+++ mysql-multilib.eclass	10 Jun 2015 18:08:02 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.20 2015/05/24 04:35:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.21 2015/06/10 18:08:02 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -101,16 +101,6 @@
 # This eclass should only be used with at least mysql-5.5.35
 mysql_version_is_at_least "5.5.35" || die "This eclass should only be used with >=mysql-5.5.35"
 
-# @ECLASS-VARIABLE: XTRADB_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Version of the XTRADB storage engine
-
-# @ECLASS-VARIABLE: PERCONA_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Designation by PERCONA for a MySQL version to apply an XTRADB release
-
 # Work out the default SERVER_URI correctly
 if [[ -z ${SERVER_URI} ]]; then
 	[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
@@ -120,8 +110,13 @@
 			MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV})
 		MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
 		SERVER_URI="
-		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+		http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+		http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+		http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+		http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+		http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+		http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
@@ -353,6 +348,11 @@
 		virtual/perl-Time-HiRes ) "
 fi
 
+# @ECLASS-VARIABLE: WSREP_REVISION
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Version of the sys-cluster/galera API (major version in portage) to use for galera clustering
+
 if [[ -n "${WSREP_REVISION}" ]] ; then
 	# The wsrep API version must match between the ebuild and sys-cluster/galera.
 	# This will be indicated by WSREP_REVISION in the ebuild and the first number
@@ -369,10 +369,11 @@
 	RDEPEND="${RDEPEND} ${GALERA_RDEPEND}
 		sst-rsync? ( sys-process/lsof )
 		sst-xtrabackup? (
-			>=dev-db/xtrabackup-bin-2.2.4
 			net-misc/socat[ssl]
 		)
 	"
+	# Causes a circular dependency if DBD-mysql is not already installed
+	PDEPEND="${PDEPEND} sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 )"
 fi
 
 if [[ ${PN} == "mysql-cluster" ]] ; then
@@ -391,7 +392,7 @@
 
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
+PDEPEND="${PDEPEND} perl? ( >=dev-perl/DBD-mysql-2.9004 )
 	 ~virtual/mysql-${MYSQL_PV_MAJOR}"
 
 # my_config.h includes ABI specific data
@@ -433,6 +434,9 @@
 			die
 		fi
 	fi
+	if use_if_iuse cluster && [[ "${PN}" != "mysql-cluster" ]]; then
+		die "NDB Cluster support has been removed from all packages except mysql-cluster"
+	fi
 }
 
 # @FUNCTION: mysql-multilib_pkg_setup
@@ -455,12 +459,6 @@
 	enewgroup mysql 60 || die "problem adding 'mysql' group"
 	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
 
-	if use cluster && [[ "${PN}" != "mysql-cluster" ]]; then
-		ewarn "The NDB cluster support is no longer built."
-		ewarn "Please use dev-db/mysql-cluster for NDB."
-		ewarn "In the near future, the USE flag will be removed."
-	fi
-
 	if [[ ${PN} == "mysql-cluster" ]] ; then
 		mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
 	fi
@@ -572,11 +570,18 @@
 	fi
 
 	if in_iuse bindist ; then
-		mycmakeargs+=(
-			-DWITH_READLINE=$(usex bindist 1 0)
-			-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-			$(usex bindist -DHAVE_BFD_H=0 '')
-		)
+		# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+		if multilib_is_native_abi; then
+			mycmakeargs+=(
+				-DWITH_READLINE=$(usex bindist 1 0)
+				-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+			)
+		else
+			mycmakeargs+=(
+				-DWITH_READLINE=1
+				-DNOT_FOR_DISTRIBUTION=0
+			)
+		fi
 	fi
 
 	### TODO: make this system but issues with UTF-8 prevent it





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2015-07-28 20:51 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2015-07-28 20:51 UTC (permalink / raw
  To: gentoo-commits

grknight    15/07/28 20:51:40

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Fix configuring non-native abi which leads to build failure wrt bug 556162

Revision  Changes    Path
1.1735               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1735&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1735&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1734&r2=1.1735

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1734
retrieving revision 1.1735
diff -u -r1.1734 -r1.1735
--- ChangeLog	28 Jul 2015 01:58:13 -0000	1.1734
+++ ChangeLog	28 Jul 2015 20:51:40 -0000	1.1735
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1734 2015/07/28 01:58:13 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1735 2015/07/28 20:51:40 grknight Exp $
+
+  28 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Fix configuring non-native abi which leads to build failure wrt bug 556162
 
   28 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-cmake.eclass,
   mysql-multilib.eclass:



1.23                 eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.22&r2=1.23

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mysql-multilib.eclass	28 Jul 2015 01:58:13 -0000	1.22
+++ mysql-multilib.eclass	28 Jul 2015 20:51:40 -0000	1.23
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.22 2015/07/28 01:58:13 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.23 2015/07/28 20:51:40 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -679,7 +679,11 @@
 			configure_cmake_minimal
 		fi
 	else
-		configure_cmake_standard
+		if multilib_is_native_abi ; then
+			configure_cmake_standard
+		else
+			configure_cmake_minimal
+		fi
 	fi
 
 	# Always build NDB with mysql-cluster for libndbclient





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2015-07-29 15:01 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2015-07-29 15:01 UTC (permalink / raw
  To: gentoo-commits

grknight    15/07/29 15:01:43

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Fix pkg_config function error with non-existant USE flags

Revision  Changes    Path
1.1736               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1736&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1736&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1735&r2=1.1736

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1735
retrieving revision 1.1736
diff -u -r1.1735 -r1.1736
--- ChangeLog	28 Jul 2015 20:51:40 -0000	1.1735
+++ ChangeLog	29 Jul 2015 15:01:43 -0000	1.1736
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1735 2015/07/28 20:51:40 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1736 2015/07/29 15:01:43 grknight Exp $
+
+  29 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Fix pkg_config function error with non-existant USE flags
 
   28 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
   Fix configuring non-native abi which leads to build failure wrt bug 556162



1.24                 eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.23&r2=1.24

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mysql-multilib.eclass	28 Jul 2015 20:51:40 -0000	1.23
+++ mysql-multilib.eclass	29 Jul 2015 15:01:43 -0000	1.24
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.23 2015/07/28 20:51:40 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.24 2015/07/29 15:01:43 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -876,9 +876,14 @@
 	mysql_init_vars
 
 	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-
-	if built_with_use ${CATEGORY}/${PN} minimal && ! built_with_use ${CATEGORY}/${PN} server ; then
-		die "Minimal builds do NOT include the MySQL server"
+	if [[ ${HAS_TOOLS_PATCH} ]] ; then
+		if ! built_with_use ${CATEGORY}/${PN} server ; then
+			die "Minimal builds do NOT include the MySQL server"
+		fi
+	else
+		if built_with_use ${CATEGORY}/${PN} minimal ; then
+			die "Minimal builds do NOT include the MySQL server"
+		fi
 	fi
 
 	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2015-07-30  4:22 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2015-07-30  4:22 UTC (permalink / raw
  To: gentoo-commits

grknight    15/07/30 04:22:47

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Add blocker below virtual/mysql-5.6-r4 for new split ebuilds

Revision  Changes    Path
1.1737               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1737&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1737&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1736&r2=1.1737

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1736
retrieving revision 1.1737
diff -u -r1.1736 -r1.1737
--- ChangeLog	29 Jul 2015 15:01:43 -0000	1.1736
+++ ChangeLog	30 Jul 2015 04:22:47 -0000	1.1737
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1736 2015/07/29 15:01:43 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1737 2015/07/30 04:22:47 grknight Exp $
+
+  30 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Add blocker below virtual/mysql-5.6-r4 for new split ebuilds
 
   29 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
   Fix pkg_config function error with non-existant USE flags



1.25                 eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.24&r2=1.25

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mysql-multilib.eclass	29 Jul 2015 15:01:43 -0000	1.24
+++ mysql-multilib.eclass	30 Jul 2015 04:22:47 -0000	1.25
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.24 2015/07/29 15:01:43 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.25 2015/07/30 04:22:47 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -385,7 +385,8 @@
 if [[ ${HAS_TOOLS_PATCH} ]] ; then
 	RDEPEND="${RDEPEND}
 		server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-		!client-libs? ( virtual/libmysqlclient )"
+		!client-libs? ( virtual/libmysqlclient )
+		!<virtual/mysql-5.6-r4"
 else
 	RDEPEND="${RDEPEND} !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )"
 fi
@@ -588,7 +589,7 @@
 	fi
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	mycmakeargs+=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
 		-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2015-07-30 14:04 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2015-07-30 14:04 UTC (permalink / raw
  To: gentoo-commits

grknight    15/07/30 14:04:41

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Reset mycmakeargs between ABIs

Revision  Changes    Path
1.1738               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1738&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1738&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1737&r2=1.1738

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1737
retrieving revision 1.1738
diff -u -r1.1737 -r1.1738
--- ChangeLog	30 Jul 2015 04:22:47 -0000	1.1737
+++ ChangeLog	30 Jul 2015 14:04:41 -0000	1.1738
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1737 2015/07/30 04:22:47 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1738 2015/07/30 14:04:41 grknight Exp $
+
+  30 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Reset variables between ABIs
 
   30 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
   Add blocker below virtual/mysql-5.6-r4 for new split ebuilds



1.26                 eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.25&r2=1.26

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mysql-multilib.eclass	30 Jul 2015 04:22:47 -0000	1.25
+++ mysql-multilib.eclass	30 Jul 2015 14:04:41 -0000	1.26
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.25 2015/07/30 04:22:47 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.26 2015/07/30 14:04:41 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -693,6 +693,8 @@
 		-DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
 
 	cmake-utils_src_configure
+	# Reset for each ABI
+	mycmakeargs=( )
 }
 
 mysql-multilib_src_compile() {





^ permalink raw reply	[flat|nested] 16+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
@ 2015-07-30 20:34 Brian Evans (grknight)
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Evans (grknight) @ 2015-07-30 20:34 UTC (permalink / raw
  To: gentoo-commits

grknight    15/07/30 20:34:57

  Modified:             ChangeLog mysql-multilib.eclass
  Log:
  Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra defines in the ebuild

Revision  Changes    Path
1.1739               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1739&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1739&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1738&r2=1.1739

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1738
retrieving revision 1.1739
diff -u -r1.1738 -r1.1739
--- ChangeLog	30 Jul 2015 14:04:41 -0000	1.1738
+++ ChangeLog	30 Jul 2015 20:34:57 -0000	1.1739
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1738 2015/07/30 14:04:41 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1739 2015/07/30 20:34:57 grknight Exp $
+
+  30 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
+  Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra
+  defines in the ebuild
 
   30 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
   Reset variables between ABIs



1.27                 eclass/mysql-multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.26&r2=1.27

Index: mysql-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mysql-multilib.eclass	30 Jul 2015 14:04:41 -0000	1.26
+++ mysql-multilib.eclass	30 Jul 2015 20:34:57 -0000	1.27
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.26 2015/07/30 14:04:41 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.27 2015/07/30 20:34:57 grknight Exp $
 
 # @ECLASS: mysql-multilib.eclass
 # @MAINTAINER:
@@ -45,6 +45,18 @@
 # VARIABLES:
 #
 
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NATIVE_DEFINES
+# @DESCRIPTION:
+# Add extra CMake arguments for native multilib builds
+
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NONNATIVE_DEFINES
+# @DESCRIPTION:
+# Add extra CMake arguments for non-native multilib builds
+
+# @ECLASS-VARIABLE: MYSQL_CMAKE_EXTRA_DEFINES
+# @DESCRIPTION:
+# Add extra CMake arguments
+
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
 S="${WORKDIR}/mysql"
@@ -589,7 +601,7 @@
 	fi
 
 	# debug hack wrt #497532
-	mycmakeargs+=(
+	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
 		-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
@@ -624,13 +636,6 @@
 		-DWITH_DEFAULT_FEATURE_SET=0
 	)
 
-	# systemtap only works on native ABI  bug 530132
-	if multilib_is_native_abi; then
-		mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) )
-	else
-		mycmakeargs+=( -DENABLE_DTRACE=0 )
-	fi
-
 	if in_iuse client-libs ; then
 		mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) )
 	fi
@@ -687,14 +692,23 @@
 		fi
 	fi
 
+	# systemtap only works on native ABI  bug 530132
+	if multilib_is_native_abi; then
+		mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) )
+		[[ ${MYSQL_CMAKE_NATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NATIVE_DEFINES} )
+	else
+		mycmakeargs+=( -DENABLE_DTRACE=0 )
+		[[ ${MYSQL_CMAKE_NONNATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NONNATIVE_DEFINES} )
+	fi
+
+	[[ ${MYSQL_CMAKE_EXTRA_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_EXTRA_DEFINES} )
+
 	# Always build NDB with mysql-cluster for libndbclient
 	[[ ${PN} == "mysql-cluster" ]] && mycmakeargs+=(
 		-DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1
 		-DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
 
 	cmake-utils_src_configure
-	# Reset for each ABI
-	mycmakeargs=( )
 }
 
 mysql-multilib_src_compile() {





^ permalink raw reply	[flat|nested] 16+ messages in thread
end of thread, other threads:[~2015-07-30 20:35 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-10 18:08 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass Brian Evans (grknight)
  -- strict thread matches above, loose matches on Subject: below --
2015-07-30 20:34 Brian Evans (grknight)
2015-07-30 14:04 Brian Evans (grknight)
2015-07-30  4:22 Brian Evans (grknight)
2015-07-29 15:01 Brian Evans (grknight)
2015-07-28 20:51 Brian Evans (grknight)
2015-03-17 19:39 Brian Evans (grknight)
2015-02-16 17:25 Brian Evans (grknight)
2015-02-10 18:14 Brian Evans (grknight)
2015-02-08 22:03 Brian Evans (grknight)
2014-09-26 17:56 Brian Evans (grknight)
2014-09-26 17:49 Brian Evans (grknight)
2014-09-03 13:05 Brian Evans (grknight)
2014-08-29 18:50 Brian Evans (grknight)
2014-08-17 22:50 Brian Evans (grknight)
2014-07-31  2:31 Brian Evans (grknight)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox