summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHiroshi Hatake2020-01-19 14:18:25 +0900
committerHiroshi Hatake2020-01-19 14:19:39 +0900
commit09480f58b38594f666fafa757fbafd38ee7d3f09 (patch)
treed9bfb768fb6a8bb68a3b01cd0a709c19272788c7
parente4e0afbdcf0154e1fef8fb9238ed2b11cdb4e35f (diff)
downloadaur-09480f58b38594f666fafa757fbafd38ee7d3f09.tar.gz
mroonga 9.11-1
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD117
2 files changed, 78 insertions, 60 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 95369160a66..c3d2d815b31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mroonga
- pkgdesc = Fast fulltext search on MySQL(MariaDB and groonga bundled package).
- pkgver = 9.10
+ pkgdesc = Fast fulltext search on MySQL(MariaDB bundled Mroonga package).
+ pkgver = 9.11
pkgrel = 1
url = http://mroonga.org/
arch = i686
@@ -8,12 +8,15 @@ pkgbase = mroonga
license = LGPL2
makedepends = cmake
makedepends = openssl
+ makedepends = systemd
makedepends = zlib
+ makedepends = zstd
makedepends = libaio
makedepends = libxml2
makedepends = pcre
makedepends = jemalloc
makedepends = lz4
+ makedepends = boost
depends = perl
depends = inetutils
depends = libaio
@@ -24,9 +27,9 @@ pkgbase = mroonga
optdepends = cutter-test_framework
optdepends = ruby
optdepends = snowball-c
- provides = mysql-clients=10.3.18
- provides = mysql=10.3.18
- provides = libmysqlclient=10.3.18
+ provides = mysql-clients=10.4.11
+ provides = mysql=10.4.11
+ provides = libmysqlclient=10.4.11
conflicts = libmariadbclient
conflicts = mariadb-clients
conflicts = mytop
@@ -34,13 +37,13 @@ pkgbase = mroonga
conflicts = mysql
conflicts = libmysqlclient
conflicts = mysql-clients
- source = http://packages.groonga.org/source/mroonga/mroonga-9.10.tar.gz
- source = https://downloads.mariadb.org/f/mariadb-10.3.18/source/mariadb-10.3.18.tar.gz
+ source = http://packages.groonga.org/source/mroonga/mroonga-9.11.tar.gz
+ source = https://downloads.mariadb.org/f/mariadb-10.4.11/source/mariadb-10.4.11.tar.gz
source = mariadb.service
source = mariadb-post.sh
source = mariadb-tmpfile.conf
- sha1sums = 4f8f3df3deff24a36e471e82e84c34724cc0b3c4
- sha1sums = 922a317edd6f44baacc49831ca278e7a9878a363
+ sha1sums = 2b75b96e39b9efa383eb4255c38be0f0c9a6edcf
+ sha1sums = e633ea0bff6dcd22722bda4cdc66fdfdd1afc4a5
sha1sums = 4bc34244fc4b578c155c8cd569d952a97a476f10
sha1sums = 206e9f7ba5357027becc2491e0987442f684d63e
sha1sums = c2a86c745002923234f9d6d79b3b462d5ab55e8d
diff --git a/PKGBUILD b/PKGBUILD
index 64b943ff943..5300415e052 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
# Maintainer: Hiroshi Hatake <cosmo0920.wp[at]gmail.com>
pkgname=mroonga
-pkgver=9.10
+pkgver=9.11
pkgrel=1
-pkgdesc="Fast fulltext search on MySQL(MariaDB and groonga bundled package)."
-mariadbver=10.3.18
+pkgdesc="Fast fulltext search on MySQL(MariaDB bundled Mroonga package)."
+mariadbver=10.4.11
MYSQL_VERSION=mariadb-${mariadbver}
arch=('i686' 'x86_64')
url="http://mroonga.org/"
@@ -15,7 +15,7 @@ source=(http://packages.groonga.org/source/mroonga/mroonga-$pkgver.tar.gz
mariadb.service
mariadb-post.sh
mariadb-tmpfile.conf)
-makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'pcre' 'jemalloc' 'lz4' )
+makedepends=('cmake' 'openssl' 'systemd' 'zlib' 'zstd' 'libaio' 'libxml2' 'pcre' 'jemalloc' 'lz4' 'boost' )
conflicts=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb' 'mysql' 'libmysqlclient' 'mysql-clients')
depends=('perl' 'inetutils' 'libaio' 'libxml2' 'pcre' 'groonga' 'groonga-normalizer-mysql')
optdepends=('cutter-test_framework' 'ruby' 'snowball-c')
@@ -26,56 +26,71 @@ prepare() {
cd $srcdir
mkdir -p $srcdir/mariadb-$mariadbver/storage/mroonga
mv $srcdir/mroonga-${pkgver}/* $srcdir/mariadb-$mariadbver/storage/mroonga
+
+ cd $srcdir/mariadb-$mariadbver
+ patch -p1 < $srcdir/no-rtti-mroonga.patch
}
build() {
cd $srcdir/mariadb-$mariadbver
- cmake . \
- -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 \
- -DMYSQL_UNIX_ADDR=/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 \
- -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 -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
- -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
- -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
+ local _cmake_options=(
+ # build options
+ -DCOMPILATION_COMMENT="Mroonga on AUR"
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -Wno-dev
+
+ # file paths
+ # /etc
+ -DINSTALL_SYSCONFDIR=/etc
+ -DINSTALL_SYSCONF2DIR=/etc/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
+
+ # workaround.
+ # See: https://jira.mariadb.org/browse/MDEV-21368
+ -DPLUGIN_CASSANDRA=NO
+ )
+ cmake . "${_cmake_options[@]}"
make
}
@@ -98,8 +113,8 @@ package() {
install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
}
-sha1sums=('4f8f3df3deff24a36e471e82e84c34724cc0b3c4'
- '922a317edd6f44baacc49831ca278e7a9878a363'
+sha1sums=('2b75b96e39b9efa383eb4255c38be0f0c9a6edcf'
+ 'e633ea0bff6dcd22722bda4cdc66fdfdd1afc4a5'
'4bc34244fc4b578c155c8cd569d952a97a476f10'
'206e9f7ba5357027becc2491e0987442f684d63e'
'c2a86c745002923234f9d6d79b3b462d5ab55e8d')