diff options
-rw-r--r-- | .SRCINFO | 34 | ||||
-rw-r--r-- | PKGBUILD | 46 |
2 files changed, 38 insertions, 42 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Sat Oct 27 23:20:14 UTC 2018 pkgbase = mysql pkgdesc = Fast SQL database server, community edition - pkgver = 8.0.13 + pkgver = 8.0.14 pkgrel = 1 url = https://www.mysql.com/products/community/ arch = x86_64 @@ -16,17 +14,20 @@ pkgbase = mysql makedepends = rpcsvc-proto makedepends = libtirpc makedepends = icu + makedepends = libedit + makedepends = libevent + makedepends = re2 + makedepends = rapidjson + makedepends = protobuf options = !libtool options = !ccache - source = https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-8.0.13.tar.gz - source = http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.tar.gz + source = https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.14.tar.gz source = mysqld-post.sh source = mysqld-tmpfile.conf source = mysqld.service source = my-default.cnf source = mysql-ld.so.conf - sha256sums = d85eb7f98b6aa3e2c6fe38263bf40b22acb444a4ce1f4668473e9e59fb98d62e - sha256sums = 8aa4e330c870ef50a896634c931adf468b21f8a69b77007e45c444151229f665 + sha256sums = afc608989a120c204524dcf107af23a41b3665e900fd0f17080705bbf2c13de0 sha256sums = 368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd sha256sums = 2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd sha256sums = 50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556 @@ -43,8 +44,11 @@ pkgname = mysql depends = libaio depends = libtirpc depends = icu - provides = mariadb=8.0.13 - provides = mysql=8.0.13 + depends = lz4 + depends = libevent + depends = protobuf + provides = mariadb=8.0.14 + provides = mysql=8.0.14 conflicts = mariadb options = emptydirs backup = etc/mysql/my.cnf @@ -53,9 +57,11 @@ pkgname = libmysqlclient pkgdesc = MySQL client libraries depends = libsasl depends = zlib - provides = libmariadbclient=8.0.13 - provides = libmysqlclient=8.0.13 + provides = libmariadbclient=8.0.14 + provides = libmysqlclient=8.0.14 + provides = mariadb-libs=8.0.14 conflicts = libmariadbclient + conflicts = mariadb-libs pkgname = mysql-clients pkgdesc = MySQL client tools @@ -63,7 +69,9 @@ pkgname = mysql-clients depends = zlib depends = openssl depends = jemalloc - provides = mariadb-clients=8.0.13 - provides = mysql-clients=8.0.13 + depends = libedit + depends = lz4 + provides = mariadb-clients=8.0.14 + provides = mysql-clients=8.0.14 conflicts = mariadb-clients @@ -5,25 +5,23 @@ pkgname=('mysql' 'libmysqlclient' 'mysql-clients') pkgbase=mysql -pkgver=8.0.13 +pkgver=8.0.14 pkgrel=1 pkgdesc="Fast SQL database server, community edition" arch=('x86_64') makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc' - 'rpcsvc-proto' 'libtirpc' 'icu') -_boost_ver=1.67.0 + 'rpcsvc-proto' 'libtirpc' 'icu' 'libedit' 'libevent' 're2' + 'rapidjson' 'protobuf') license=('GPL') url="https://www.mysql.com/products/community/" options=('!libtool' '!ccache') # Sorry but actually ccache is not supported -source=("https://dev.mysql.com/get/Downloads/MySQL-5.7/${pkgbase}-${pkgver}.tar.gz" - "http://sourceforge.net/projects/boost/files/boost/${_boost_ver}/boost_${_boost_ver//./_}.tar.gz" +source=("https://cdn.mysql.com/Downloads/MySQL-8.0/${pkgbase}-boost-${pkgver}.tar.gz" "mysqld-post.sh" "mysqld-tmpfile.conf" "mysqld.service" "my-default.cnf" "mysql-ld.so.conf") -sha256sums=('d85eb7f98b6aa3e2c6fe38263bf40b22acb444a4ce1f4668473e9e59fb98d62e' - '8aa4e330c870ef50a896634c931adf468b21f8a69b77007e45c444151229f665' +sha256sums=('afc608989a120c204524dcf107af23a41b3665e900fd0f17080705bbf2c13de0' '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd' '50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556' @@ -43,8 +41,6 @@ build() { -DSYSCONFDIR=/etc/mysql \ -DMYSQL_DATADIR=/var/lib/mysql \ -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ - -DDEFAULT_CHARSET=utf8 \ - -DDEFAULT_COLLATION=utf8_general_ci \ -DENABLED_LOCAL_INFILE=ON \ -DINSTALL_INFODIR=share/mysql/docs \ -DINSTALL_MANDIR=share/man \ @@ -56,32 +52,24 @@ build() { -DINSTALL_MYSQLSHAREDIR=share/mysql \ -DINSTALL_DOCDIR=share/mysql/docs \ -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_ZLIB=system \ - -DWITH_SSL=system \ - -DWITH_ICU=system \ + -DWITH_SYSTEM_LIBS=ON \ -DWITH_LIBWRAP=OFF \ -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \ - -DWITH_EXTRA_CHARSETS=complex \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ - -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=ON \ - -DWITH_PARTITION_STORAGE_ENGINE=ON \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=ON \ -DWITHOUT_FEDERATED_STORAGE_ENGINE=ON \ - -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \ - -DCMAKE_C_LINK_FLAGS="${LDFLAGS},-pie" \ - -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -std=gnu++11 -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-delete-null-pointer-checks" \ - -DCMAKE_CXX_LINK_FLAGS="${LDFLAGS},-pie" \ - -DWITH_BOOST="../boost_${_boost_ver//./_}" + -DCMAKE_C_FLAGS="${CFLAGS}" \ + -DCMAKE_C_LINK_FLAGS="${LDFLAGS}" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ + -DCMAKE_CXX_LINK_FLAGS="${LDFLAGS}" \ + -DWITH_BOOST="../${pkgname}-${pkgver}/boost" make } package_libmysqlclient(){ pkgdesc="MySQL client libraries" depends=('libsasl' 'zlib') - conflicts=('libmariadbclient') - provides=("libmariadbclient=${pkgver}" "libmysqlclient=${pkgver}") + conflicts=('libmariadbclient' 'mariadb-libs') + provides=("libmariadbclient=${pkgver}" "libmysqlclient=${pkgver}" "mariadb-libs=${pkgver}") cd build for dir in include libmysql libservices @@ -100,7 +88,7 @@ package_libmysqlclient(){ package_mysql-clients(){ pkgdesc="MySQL client tools" - depends=('libmysqlclient' 'zlib' 'openssl' 'jemalloc') + depends=('libmysqlclient' 'zlib' 'openssl' 'jemalloc' 'libedit' 'lz4') conflicts=('mariadb-clients') provides=("mariadb-clients=${pkgver}" "mysql-clients=${pkgver}") @@ -127,7 +115,8 @@ package_mysql(){ pkgdesc="Fast SQL database server, community edition" backup=('etc/mysql/my.cnf') install="${pkgbase}.install" - depends=('mysql-clients' 'libsasl' 'zlib' 'jemalloc' 'libaio' 'libtirpc' 'icu') + depends=('mysql-clients' 'libsasl' 'zlib' 'jemalloc' 'libaio' 'libtirpc' 'icu' + 'lz4' 'libevent' 'protobuf') conflicts=('mariadb') provides=("mariadb=${pkgver}" "mysql=${pkgver}") options=('emptydirs') @@ -147,7 +136,7 @@ package_mysql(){ rm "${pkgdir}/usr/bin/mysql_config" rm "${pkgdir}/usr/lib/libmysqlclient.so" rm "${pkgdir}/usr/lib/libmysqlclient.so.21" - rm "${pkgdir}/usr/lib/libmysqlclient.so.21.0.13" + rm "${pkgdir}/usr/lib/libmysqlclient.so.21.0.14" rm "${pkgdir}/usr/lib/libmysqlservices.a" rm "${pkgdir}/usr/lib/mysql/plugin/authentication_ldap_sasl_client.so" rm -r "${pkgdir}/usr/include/" @@ -173,7 +162,6 @@ package_mysql(){ # not needed rm -r "${pkgdir}/usr/mysql-test" rmdir "${pkgdir}/usr/run" - rmdir "${pkgdir}/usr/data" # Move somewhere else mv "${pkgdir}/usr/LICENSE.router" "${pkgdir}/usr/share/mysql/docs" |