[arch-commits] Commit in mariadb/trunk (PKGBUILD mariadb.install)
Christian Hesse
eworm at archlinux.org
Mon Jan 14 12:46:32 UTC 2019
Date: Monday, January 14, 2019 @ 12:46:25
Author: eworm
Revision: 344065
another bunch of changes
* package rename: libmariadb(client) -> mariadb-libs
* updated build options, moved to array
* added upgrade message for feature releases
* general cleanups
Modified:
mariadb/trunk/PKGBUILD
mariadb/trunk/mariadb.install
-----------------+
PKGBUILD | 159 +++++++++++++++++++++++++++++-------------------------
mariadb.install | 8 ++
2 files changed, 96 insertions(+), 71 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-01-14 12:35:51 UTC (rev 344064)
+++ PKGBUILD 2019-01-14 12:46:25 UTC (rev 344065)
@@ -2,7 +2,8 @@
# Maintainer: Christian Hesse <mail at eworm.de>
pkgbase=mariadb
-pkgname=('libmariadb' 'mariadb-clients' 'mytop' 'mariadb')
+pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
+pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
pkgver=10.3.12
pkgrel=0
arch=('x86_64')
@@ -9,7 +10,7 @@
license=('GPL')
url='https://mariadb.org/'
makedepends=('boost' 'bzip2' 'cmake' 'jemalloc' 'libaio' 'libxml2' 'lz4' 'lzo'
- 'openssl' 'systemd' 'zlib')
+ 'openssl' 'systemd' 'zlib' 'zstd')
validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key <package-signing-key at mariadb.org>
source=("https://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc})
sha256sums=('f7449a34c25e0455928d7983dae83fd2069fe1f16c4c5f4aeed9ed9d3f081ff6'
@@ -36,54 +37,63 @@
}
build() {
+ local _cmake_options=(
+ # build options
+ -DCMAKE_BUILD_TYPE=RwlWithDebInfo
+ -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc'
+ -Wno-dev
+
+ # file paths
+ # /etc
+ -DINSTALL_SYSCONFDIR=/etc/mysql
+ -DINSTALL_SYSCONF2DIR=/etc/mysql/my.cnf.d
+ # /run
+ -DINSTALL_UNIX_ADDRDIR=/run/mysqld/mysqld.sock
+ # /usr
+ -DCMAKE_INSTALL_PREFIX=/usr
+ # /usr/bin /usr/include
+ -DINSTALL_SCRIPTDIR=bin
+ -DINSTALL_INCLUDEDIR=include/mysql
+ # /usr/lib
+ -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SYSTEMD_UNITDIR=/usr/lib/systemd/system/
+ -DINSTALL_SYSTEMD_SYSUSERSDIR=/usr/lib/sysusers.d/
+ -DINSTALL_SYSTEMD_TMPFILESDIR=/usr/lib/tmpfiles.d/
+ # /usr/share
+ -DINSTALL_SHAREDIR=share
+ -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql
+ -DINSTALL_DOCREADMEDIR=share/doc/mariadb
+ -DINSTALL_DOCDIR=share/doc/mariadb
+ -DINSTALL_MANDIR=share/man
+ # /var
+ -DMYSQL_DATADIR=/var/lib/mysql
+
+ # default settings
+ -DDEFAULT_CHARSET=utf8mb4
+ -DDEFAULT_COLLATION=utf8mb4_unicode_ci
+
+ # features
+ -DENABLED_LOCAL_INFILE=ON
+ -DPLUGIN_EXAMPLE=NO
+ -DPLUGIN_FEDERATED=NO
+ -DPLUGIN_FEEDBACK=NO
+ -DWITH_EMBEDDED_SERVER=ON
+ -DWITH_EXTRA_CHARSETS=complex
+ -DWITH_JEMALLOC=ON
+ -DWITH_LIBWRAP=OFF
+ -DWITH_PCRE=bundled
+ -DWITH_READLINE=ON
+ -DWITH_SSL=system
+ -DWITH_SYSTEMD=yes
+ -DWITH_UNIT_TESTS=OFF
+ -DWITH_ZLIB=system
+ )
+
mkdir build
cd build
- cmake ../$pkgbase-$pkgver \
- -DCMAKE_AR=/usr/bin/gcc-ar \
- -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
- -DBUILD_CONFIG=mysql_release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMYSQL_DATADIR=/var/lib/mysql \
- -DINSTALL_UNIX_ADDRDIR=/run/mysqld/mysqld.sock \
- -DDEFAULT_CHARSET=utf8mb4 \
- -DDEFAULT_COLLATION=utf8mb4_unicode_ci \
- -DENABLED_LOCAL_INFILE=ON \
- -DINSTALL_DOCDIR=share/doc/mariadb \
- -DINSTALL_DOCREADMEDIR=share/doc/mariadb \
- -DINSTALL_MANDIR=share/man \
- -DINSTALL_PLUGINDIR=lib/mysql/plugin \
- -DINSTALL_SCRIPTDIR=bin \
- -DINSTALL_SYSCONFDIR=/etc/mysql \
- -DINSTALL_SYSCONF2DIR=/etc/mysql/my.cnf.d \
- -DINSTALL_INCLUDEDIR=include/mysql \
- -DINSTALL_SUPPORTFILESDIR=share/mysql \
- -DINSTALL_MYSQLSHAREDIR=share/mysql \
- -DINSTALL_SHAREDIR=share/mysql \
- -DINSTALL_SYSTEMD_SYSUSERSDIR=/usr/lib/sysusers.d/ \
- -DINSTALL_SYSTEMD_TMPFILESDIR=/usr/lib/tmpfiles.d/ \
- -DINSTALL_SYSTEMD_UNITDIR=/usr/lib/systemd/system/ \
- -DWITH_SYSTEMD=yes \
- -DWITH_READLINE=ON \
- -DWITH_ZLIB=system \
- -DWITH_SSL=system \
- -DWITH_PCRE=bundled \
- -DWITH_LIBWRAP=OFF \
- -DWITH_JEMALLOC=ON \
- -DWITH_EXTRA_CHARSETS=complex \
- -DWITH_EMBEDDED_SERVER=ON \
- -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
- -DWITH_INNOBASE_STORAGE_ENGINE=1 \
- -DWITH_PARTITION_STORAGE_ENGINE=1 \
- -DWITH_TOKUDB_STORAGE_ENGINE=1 \
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
- -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
- -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
- -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -fomit-frame-pointer -fno-delete-null-pointer-checks" \
- -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
- -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
+ cmake ../"$pkgbase-$pkgver" "${_cmake_options[@]}"
make
}
@@ -95,12 +105,12 @@
#./mtr --parallel=5 --mem --force --max-test-fail=0
}
-package_libmariadb() {
+package_mariadb-libs() {
pkgdesc='MariaDB libraries'
depends=('bzip2' 'libaio' 'lz4' 'lzo' 'openssl' 'xz' 'zlib')
- conflicts=('libmysqlclient' 'libmariadbclient')
+ conflicts=('libmysqlclient' 'libmariadbclient' 'mariadb-connector-c')
+ provides=('libmariadbclient' 'mariadb-connector-c')
replaces=('libmariadbclient')
- provides=('libmariadbclient')
cd build
@@ -109,6 +119,7 @@
done
ln -s mariadb_config "$pkgdir"/usr/bin/mysql_config
+ install -D -m0644 "$srcdir"/"$pkgbase-$pkgver"/man/mysql_config.1 "$pkgdir"/usr/share/man/man1/mysql_config.1
install -D -m0644 support-files/mariadb.pc "$pkgdir"/usr/share/pkgconfig/mariadb.pc
install -D -m0644 "$srcdir"/"$pkgbase-$pkgver"/support-files/mysql.m4 "$pkgdir"/usr/share/aclocal/mysql.m4
@@ -119,7 +130,7 @@
package_mariadb-clients() {
pkgdesc='MariaDB client tools'
- depends=("libmariadb=${pkgver}" 'jemalloc')
+ depends=("mariadb-libs=${pkgver}" 'jemalloc')
conflicts=('mysql-clients')
provides=("mysql-clients=$pkgver")
@@ -129,19 +140,10 @@
# install man pages
for man in mysql mysql_plugin mysql_upgrade mysqladmin mysqlbinlog mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap mysqltest; do
- install -D -m0644 "$srcdir"/"$pkgbase-$pkgver"/man/$man.1 "$pkgdir"/usr/share/man/man1/"$man.1"
+ install -D -m0644 "$srcdir"/"$pkgbase-$pkgver"/man/"$man.1" "$pkgdir"/usr/share/man/man1/"$man.1"
done
}
-package_mytop() {
- pkgdesc='Top clone for MariaDB'
- depends=('perl' 'perl-dbd-mysql' 'perl-term-readkey')
-
- cd build
-
- install -D -m0755 scripts/mytop "$pkgdir"/usr/bin/mytop
-}
-
package_mariadb() {
pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
backup=('etc/mysql/my.cnf'
@@ -150,7 +152,7 @@
'etc/mysql/my.cnf.d/mysql-clients.cnf'
'etc/mysql/my.cnf.d/server.cnf')
install=mariadb.install
- depends=("mariadb-clients=${pkgver}" 'inetutils' 'libsystemd' 'libxml2')
+ depends=("mariadb-clients=${pkgver}" 'inetutils' 'libsystemd' 'libxml2' 'zstd')
optdepends=('galera: for MariaDB cluster with Galera WSREP'
'perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
conflicts=('mysql')
@@ -165,10 +167,14 @@
# no SysV init, please!
rm -r etc/mysql/{init.d,logrotate.d}
+ rm usr/bin/rcmysql
+ rm usr/share/mysql/{binary-configure,mysql{,d_multi}.server}
+ # these should have useful names
mv usr/lib/sysusers.d/{sysusers,mariadb}.conf
mv usr/lib/tmpfiles.d/{tmpfiles,mariadb}.conf
+ # links service files with old name for compatibility
ln -s mariadb.service usr/lib/systemd/system/mysqld.service
ln -s mariadb at .service usr/lib/systemd/system/mysqld at .service
@@ -176,21 +182,23 @@
install -d usr/share/licenses/mariadb
mv usr/share/doc/mariadb/COPYING* usr/share/licenses/mariadb/
- # already installed to real systemd unit directory
+ # move it where one might look for it
+ mv usr/share/{groonga,doc/mariadb/}
+ mv usr/share/{groonga-normalizer-mysql,doc/mariadb/}
+
+ # already installed to real systemd unit directory or useless
rm -r usr/share/mysql/systemd/
+ rm -r usr/lib/systemd/system/mariadb at bootstrap.service.d
- # left over from sysvinit
- rm usr/bin/rcmysql
-
- # provided by libmariadb
+ # provided by mariadb-libs
rm usr/bin/mariadb_config
rm usr/bin/mysql_config
+ rm -r usr/include/
+ rm usr/share/man/man1/mysql_config.1
+ rm -r usr/share/{aclocal,pkgconfig}
rm usr/lib/lib*
- rm usr/share/man/man1/mysql_config.1
- rm -r usr/include/
- rm -r usr/share/mysql/{aclocal,pkgconfig}
rm usr/lib/mysql/plugin/{auth_gssapi_client,caching_sha2_password,dialog,mysql_clear_password,sha256_password}.so
- rm usr/lib/pkgconfig/libmariadb.pc
+ rm -r usr/lib/pkgconfig/
# provided by mariadb-clients
rm usr/bin/{mysql,mysql_plugin,mysql_upgrade,mysqladmin,mysqlbinlog,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,mysqltest}
@@ -203,3 +211,12 @@
rm -r usr/{data,mysql-test,sql-bench}
rm usr/share/man/man1/mysql-test-run.pl.1
}
+
+package_mytop() {
+ pkgdesc='Top clone for MariaDB'
+ depends=('perl' 'perl-dbd-mysql' 'perl-term-readkey')
+
+ cd build
+
+ install -D -m0755 scripts/mytop "$pkgdir"/usr/bin/mytop
+}
Modified: mariadb.install
===================================================================
--- mariadb.install 2019-01-14 12:35:51 UTC (rev 344064)
+++ mariadb.install 2019-01-14 12:46:25 UTC (rev 344065)
@@ -5,3 +5,11 @@
echo " the service. This can be done with mysql_install_db command, e.g.:"
echo " mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
}
+
+post_upgrade(){
+ # show for feature release: 10.1 -> 10.2 -> 10.3 -> ...
+ if [ $(vercmp "${1%.*}" "${2%.*}") -ne 0 ]; then
+ echo ":: MariaDB was updated to a new feature release. To update the data run:"
+ echo " systemctl restart mariadb.service && mysql_upgrade -u root -p"
+ fi
+}
More information about the arch-commits
mailing list