diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2017-10-15 13:19:34 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-10-15 13:19:34 +0000 |
| commit | 1711d732c054da26f2b26f9c78c1d40acf0a0b9e (patch) | |
| tree | c38d68b0d7925a3aa8082ad635a4523be43b96d2 /databases/mariadb102-server | |
| parent | f272cd6c04bd9c9f25548dcbae2e9cd4da244739 (diff) | |
| download | ports-1711d732c054da26f2b26f9c78c1d40acf0a0b9e.tar.gz ports-1711d732c054da26f2b26f9c78c1d40acf0a0b9e.zip | |
Notes
Diffstat (limited to 'databases/mariadb102-server')
| -rw-r--r-- | databases/mariadb102-server/Makefile | 14 | ||||
| -rw-r--r-- | databases/mariadb102-server/pkg-plist | 12 |
2 files changed, 15 insertions, 11 deletions
diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile index cb501758a260..8c6866a2bfb7 100644 --- a/databases/mariadb102-server/Makefile +++ b/databases/mariadb102-server/Makefile @@ -2,7 +2,7 @@ PORTNAME?= mariadb PORTVERSION= 10.2.9 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -28,7 +28,7 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb102-client -USES= bison:build cmake compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl +USES= bison:build cmake:noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source @@ -201,8 +201,12 @@ post-patch: ${WRKSRC}/cmake/os/DragonFly.cmake .endif -#post-configure-MROONGA-on: -# ${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \ -# ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt +# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 +post-configure-INNOBASE-on: + ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \ + -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \ + -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \ + -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \ + ${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt .include <bsd.port.post.mk> diff --git a/databases/mariadb102-server/pkg-plist b/databases/mariadb102-server/pkg-plist index 5bbed2930e3d..14a20c93437c 100644 --- a/databases/mariadb102-server/pkg-plist +++ b/databases/mariadb102-server/pkg-plist @@ -44,12 +44,12 @@ bin/wsrep_sst_mysqldump bin/wsrep_sst_rsync bin/wsrep_sst_xtrabackup bin/wsrep_sst_xtrabackup-v2 -include/mysql/my_config.h -include/mysql/my_global.h -include/mysql/my_sys.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -include/mysql/mysqld_error.h +@comment include/mysql/my_config.h +@comment include/mysql/my_global.h +@comment include/mysql/my_sys.h +@comment include/mysql/mysql_com.h +@comment include/mysql/mysql_version.h +@comment include/mysql/mysqld_error.h include/mysql/server/private/embedded_priv.h @comment lib/mysql/libmariadb.so @comment lib/mysql/libmariadb.so.3 |