diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2003-10-03 16:10:16 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2003-10-03 16:10:16 +0000 |
| commit | 959ae08171f451eaabe27038fbb59f27eaba5b25 (patch) | |
| tree | 6a34eaf1db8b768416d7370ede225ea1d3553dbc /databases/mysql40-server | |
| parent | p5-DateTime-HiRes 0.01, (diff) | |
Protect against accidentally defining USE_MYSQL in the environment or
on the make(1) command line[1].
Unbreak mysql40-server's building on -CURRENT (-pthread)[2].
PR: 56252[1], 56925[2]
Submitted by: Clement Laforet <sheepkiller@cultdeadsheep.org> [1],
Alex Dupre <sysadmin@alexdupre.com> (maintainer) [2]
Notes
Notes:
svn path=/head/; revision=90144
Diffstat (limited to 'databases/mysql40-server')
| -rw-r--r-- | databases/mysql40-server/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 2dfd1012607f..836269ee0a68 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -46,6 +46,10 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client +.ifdef USE_MYSQL +.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. +.endif + .include <bsd.port.pre.mk> .if ${MACHINE_ARCH} == "i386" @@ -126,6 +130,7 @@ pre-fetch: post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in + @${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g" .if defined(WITH_OPENSSL) && defined(BUILD_STATIC) pre-configure: @@ -172,6 +177,7 @@ CONFIGURE_ARGS+=--without-server post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in + @${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g" post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh |