Attachment #241893 for bug #331691

View | Details | Raw Unified | Return to bug 331691
Collapse All | Expand All




&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"

# Having different flavours at the same time is not a good idea
for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
	[[ "${i}" == ${PN} ]] ||
	DEPEND="${DEPEND} !dev-db/${i}"
done

PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"

# For other stuff to bring us in
[[ "${PN}" == "mysql-cluster" ]] ||
PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"

# Work out the default SERVER_URI correctly

		http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
		http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
		"
	# The community and cluster builds are on the mirrors
	elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" || ${PN} == "mysql-cluster" ]] ; then
		if [[ "${PN}" == "mysql-cluster" ]] ; then
			URI_DIR="MySQL-Cluster"
			URI_FILE="mysql-cluster-gpl"
		else
			URI_DIR="MySQL"
			URI_FILE="mysql"
		fi
		SERVER_URI="mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_FILE}-${MY_PV}.tar.gz"
	# The (old) enterprise source is on the primary site only
	elif [ "${PN}" == "mysql" ]; then
		SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"

mysql_version_is_at_least "4.1" \
&& IUSE="${IUSE} latin1"

if [[ "${PN}" == "mysql-cluster" ]] ; then
	IUSE="${IUSE} extraengine"
else

	if mysql_version_is_at_least "4.1.3"; then
		IUSE="${IUSE} cluster extraengine"
	fi
fi

mysql_version_is_at_least "5.0" \
|| IUSE="${IUSE} raid"

	else
		myconf="${myconf} --without-debug"
		mysql_version_is_at_least "4.1.3" \
		&& ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
		&& myconf="${myconf} --without-ndb-debug"
	fi



	if mysql_version_is_at_least "4.1.3" ; then
		myconf="${myconf} --with-geometry"
		if [[ "${PN}" != "mysql-cluster" ]] ; then
			myconf="${myconf} $(use_with cluster ndbcluster)"
		fi
	fi

	if mysql_version_is_at_least "4.1.3" && use extraengine ; then

	done

	# like configuration=max-no-ndb
	if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
		plugins_sta="${plugins_sta} ndbcluster partition"
		plugins_dis="${plugins_dis//partition}"
		myconf="${myconf} --with-ndb-binlog"
	else
		plugins_dis="${plugins_dis} ndbcluster"
	fi
	
	# No falcon in MySQL Cluster
	if ( mysql_version_is_at_least "5.2" && [[ "${PN}" != "mysql-cluster" ]] ) ; then
		plugins="${plugins},falcon"
	fi

	if [[ "${PN}" == "mariadb" ]] ; then
		# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not

	i="${S}"/storage/innodb_plugin/plug.in	
	[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"

	# Additional checks, remove bundled zlib (Cluster needs this, for static
	# memory management in zlib, leave available for Cluster)
	if [[ "${PN}" != "mysql-cluster" ]] ; then
		rm -f "${S}/zlib/"*.[ch]
		sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
	fi
	rm -f "scripts/mysqlbug"

	# Make charsets install in the right place

	options="${options/skip-locking/skip-external-locking}"

	if mysql_version_is_at_least "4.1.3" ; then
		options="--skip-ndbcluster"
		
		# Filling timezones, see
		# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
		"${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null

Return to bug 331691

Lines 126-132 Link Here

(-)/usr/portage/eclass/mysql.eclass (-12 / +38 lines)
126	&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"	126	&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
127		127
128	# Having different flavours at the same time is not a good idea	128	# Having different flavours at the same time is not a good idea
129	for i in "mysql" "mysql-community" "mariadb" ; do	129	for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
130	[[ "${i}" == ${PN} ]] \|\|	130	[[ "${i}" == ${PN} ]] \|\|
131	DEPEND="${DEPEND} !dev-db/${i}"	131	DEPEND="${DEPEND} !dev-db/${i}"
132	done	132	done
Lines 147-152 Link Here
147	PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"	147	PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
148		148
149	# For other stuff to bring us in	149	# For other stuff to bring us in
		150	[[ "${PN}" == "mysql-cluster" ]] \|\|
150	PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"	151	PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
151		152
152	# Work out the default SERVER_URI correctly	153	# Work out the default SERVER_URI correctly
Lines 160-168 Link Here
160	http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz	161	http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
161	http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz	162	http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
162	"	163	"
163	# The community build is on the mirrors	164	# The community and cluster builds are on the mirrors
164	elif [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then	165	elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" \|\| ${PN} == "mysql-cluster" ]] ; then
165	SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz"	166	if [[ "${PN}" == "mysql-cluster" ]] ; then
		167	URI_DIR="MySQL-Cluster"
		168	URI_FILE="mysql-cluster-gpl"
		169	else
		170	URI_DIR="MySQL"
		171	URI_FILE="mysql"
		172	fi
		173	SERVER_URI="mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_FILE}-${MY_PV}.tar.gz"
166	# The (old) enterprise source is on the primary site only	174	# The (old) enterprise source is on the primary site only
167	elif [ "${PN}" == "mysql" ]; then	175	elif [ "${PN}" == "mysql" ]; then
168	SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"	176	SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
Lines 195-202 Link Here
195	mysql_version_is_at_least "4.1" \	203	mysql_version_is_at_least "4.1" \
196	&& IUSE="${IUSE} latin1"	204	&& IUSE="${IUSE} latin1"
197		205
198	mysql_version_is_at_least "4.1.3" \	206	if [[ "${PN}" == "mysql-cluster" ]] ; then
199	&& IUSE="${IUSE} cluster extraengine"	207	IUSE="${IUSE} extraengine"
		208	else
		209
		210	if mysql_version_is_at_least "4.1.3"; then
		211	IUSE="${IUSE} cluster extraengine"
		212	fi
		213	fi
200		214
201	mysql_version_is_at_least "5.0" \	215	mysql_version_is_at_least "5.0" \
202	\|\| IUSE="${IUSE} raid"	216	\|\| IUSE="${IUSE} raid"
Lines 425-431 Link Here
425	else	439	else
426	myconf="${myconf} --without-debug"	440	myconf="${myconf} --without-debug"
427	mysql_version_is_at_least "4.1.3" \	441	mysql_version_is_at_least "4.1.3" \
428	&& use cluster \	442	&& ( use cluster \|\| [[ "${PN}" == "mysql-cluster" ]] ) \
429	&& myconf="${myconf} --without-ndb-debug"	443	&& myconf="${myconf} --without-ndb-debug"
430	fi	444	fi
431		445
Lines 492-498 Link Here
492		506
493	if mysql_version_is_at_least "4.1.3" ; then	507	if mysql_version_is_at_least "4.1.3" ; then
494	myconf="${myconf} --with-geometry"	508	myconf="${myconf} --with-geometry"
495	myconf="${myconf} $(use_with cluster ndbcluster)"	509	if [[ "${PN}" != "mysql-cluster" ]] ; then
		510	myconf="${myconf} $(use_with cluster ndbcluster)"
		511	fi
496	fi	512	fi
497		513
498	if mysql_version_is_at_least "4.1.3" && use extraengine ; then	514	if mysql_version_is_at_least "4.1.3" && use extraengine ; then
Lines 613-625 Link Here
613	done	629	done
614		630
615	# like configuration=max-no-ndb	631	# like configuration=max-no-ndb
616	if use cluster ; then	632	if ( use cluster \|\| [[ "${PN}" == "mysql-cluster" ]] ) ; then
617	plugins_sta="${plugins_sta} ndbcluster partition"	633	plugins_sta="${plugins_sta} ndbcluster partition"
618	plugins_dis="${plugins_dis//partition}"	634	plugins_dis="${plugins_dis//partition}"
619	myconf="${myconf} --with-ndb-binlog"	635	myconf="${myconf} --with-ndb-binlog"
620	else	636	else
621	plugins_dis="${plugins_dis} ndbcluster"	637	plugins_dis="${plugins_dis} ndbcluster"
622	fi	638	fi
		639
		640	# No falcon in MySQL Cluster
		641	if ( mysql_version_is_at_least "5.2" && [[ "${PN}" != "mysql-cluster" ]] ) ; then
		642	plugins="${plugins},falcon"
		643	fi
623		644
624	if [[ "${PN}" == "mariadb" ]] ; then	645	if [[ "${PN}" == "mariadb" ]] ; then
625	# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not	646	# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
Lines 811-819 Link Here
811	i="${S}"/storage/innodb_plugin/plug.in	832	i="${S}"/storage/innodb_plugin/plug.in
812	[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"	833	[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
813		834
814	# Additional checks, remove bundled zlib	835	# Additional checks, remove bundled zlib (Cluster needs this, for static
815	rm -f "${S}/zlib/"*.[ch]	836	# memory management in zlib, leave available for Cluster)
816	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"	837	if [[ "${PN}" != "mysql-cluster" ]] ; then
		838	rm -f "${S}/zlib/"*.[ch]
		839	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
		840	fi
817	rm -f "scripts/mysqlbug"	841	rm -f "scripts/mysqlbug"
818		842
819	# Make charsets install in the right place	843	# Make charsets install in the right place
Lines 1278-1283 Link Here
1278	options="${options/skip-locking/skip-external-locking}"	1302	options="${options/skip-locking/skip-external-locking}"
1279		1303
1280	if mysql_version_is_at_least "4.1.3" ; then	1304	if mysql_version_is_at_least "4.1.3" ; then
		1305	options="--skip-ndbcluster"
		1306
1281	# Filling timezones, see	1307	# Filling timezones, see
1282	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html	1308	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
1283	"${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null	1309	"${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null