snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

mariadb: merge mariadb-client into mariadb 

mariadb-client consisted almost entirely of symlinks to the main package
and manpages, and did not depend on the main package, so the symlinks
were broken if mariadb was not also installed.

fixes #37282
This commit is contained in:
classabbyamp 2022-05-25 00:25:46 -04:00 committed by classabbyamp
parent 72d051fb73
commit e997c195b4
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
srcpkgs/mariadb/template
View File

@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
revision=2
revision=3
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
@ -20,7 +20,7 @@ configure_args="-DBUILD_CONFIG=mysql_release
hostmakedepends="bison perl flex pkg-config"
makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
pcre2-devel libatomic-devel"
depends="mariadb-client"
depends="perl"
checkdepends="perl"
short_desc="Fast SQL database server, drop-in replacement for MySQL"
maintainer="Justin Jagieniak <justin@jagieniak.net>"
@ -81,6 +81,7 @@ libmariadbclient_package() {
vmove "usr/lib/libmariadb*.so.*"
}
}
libmariadbclient-devel_package() {
depends="libmariadbclient>=${version}_${revision} libatomic-devel"
provides="libmysqlclient-devel-${version}_${revision}"
@ -94,31 +95,13 @@ libmariadbclient-devel_package() {
vmove "usr/lib/*.so"
}
}
mariadb-client_package() {
depends="perl"
build_style=meta
depends="mariadb"
provides="mysql-client-${version}_${revision}"
replaces="mysql-client>=0"
short_desc+=" - client binaries"
pkg_install() {
for f in innochecksum innotop myisam_ftdump mysql mysql_client_test \
mysql_client_test_embedded mysqldumpslow mysqlbinlog \
mysql_find_rows mysql_fix_extensions mysql_waitpid mysqlaccess \
mysqladmin mysqlanalyze mysqlbug mysqlcheck mysqldump \
mysqlimport mysqloptimize mysqlrepair mysqlreport mysqlshow \
mysqlslap mysqltest_embedded mysqlmanager mysqltest \
mysqlhotcopy mysql_upgrade mysql_zap; do
if [ -f ${DESTDIR}/usr/bin/${f} ]; then
vmove usr/bin/${f}
elif [ -f ${DESTDIR}/usr/sbin/${f} ]; then
vmove usr/sbin/${f}
fi
if [ -f ${DESTDIR}/usr/share/man/man1/${f}.1 ]; then
vmove usr/share/man/man1/${f}.1
elif [ -f ${DESTDIR}/usr/share/man/man8/${f}.8 ]; then
vmove usr/share/man/man8/${f}.8
fi
done
}
short_desc+=" - client binaries (transitional dummy package)"
}
libmysqlclient_package() {