Fix build with readline from ports

This commit is contained in:
Baptiste Daroussin 2014-07-01 12:22:05 +00:00
parent d05e563a63
commit f85a534244
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=359981
7 changed files with 13 additions and 2 deletions

View file

@ -10,6 +10,7 @@ COMMENT= Database client - drop-in replacement for MySQL
MASTERDIR= ${.CURDIR}/../mariadb-server
MARIADB_CLIENT_SLAVE= yes
USES+= readline
CONFIGURE_ARGS= --without-server --with-libevent=no
OPTIONS_DEFINE= THREADSAFE

View file

@ -138,6 +138,8 @@ LIB_DEPENDS+= libboost_system.so:${PORTSDIR}/devel/boost-libs
.if ${PORT_OPTIONS:MMAXKEY}
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h
.endif
.else
USES+= readline
.endif
post-patch:

View file

@ -15,7 +15,7 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql51-client databases/mysql51-scripts
GNU_CONFIGURE= yes
USES= makeinfo
USES+= makeinfo
CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
--without-debug \
--without-readline \
@ -156,6 +156,7 @@ post-patch:
.else
# MySQL-Client part
.if defined(CLIENT_ONLY)
USES+= readline
CONFLICTS_INSTALL= mysql5.[02-9]-client-* mysql[0-46-9][0-9]-client-*
MAN1= mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \

View file

@ -77,6 +77,8 @@ MAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1
mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
.else
USES+= readline
.endif
post-patch:

View file

@ -44,7 +44,6 @@ SHEBANG_FILES= scripts/*.pl* scripts/*.sh
USE_MYSQL= yes
WANT_MYSQL_VER= 56
USES+= perl5
USE_PERL5= run
CONFLICTS_INSTALL= mysql5.[0-57-9]-server-* mysql[0-46-9][0-9]-server-* percona[0-9][0-9]-server-* mariadb[0-9][0-9]-server-*
@ -62,6 +61,8 @@ MAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1
mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
.else
USES+= readline
.endif
post-patch:

View file

@ -80,6 +80,8 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
post-install:
@${MKDIR} ${STAGEDIR}/var/db/mysql
.else
USES+= readline
.endif
post-patch:

View file

@ -81,6 +81,8 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
post-install:
@${MKDIR} ${STAGEDIR}/var/db/mysql
.else
USES+= readline
.endif
post-patch: