summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorPeter Pentchev <roam@FreeBSD.org>2003-10-03 16:10:16 +0000
committerPeter Pentchev <roam@FreeBSD.org>2003-10-03 16:10:16 +0000
commit959ae08171f451eaabe27038fbb59f27eaba5b25 (patch)
tree6a34eaf1db8b768416d7370ede225ea1d3553dbc /databases
parentp5-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')
-rw-r--r--databases/mysql323-server/Makefile4
-rw-r--r--databases/mysql40-server/Makefile6
-rw-r--r--databases/mysql41-server/Makefile4
-rw-r--r--databases/mysql50-server/Makefile4
-rw-r--r--databases/mysql51-server/Makefile4
-rw-r--r--databases/mysql54-server/Makefile4
-rw-r--r--databases/mysql55-server/Makefile4
-rw-r--r--databases/mysql60-server/Makefile4
-rw-r--r--databases/percona55-server/Makefile4
9 files changed, 38 insertions, 0 deletions
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 66516d5236fe..61b5e71c17fd 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -39,6 +39,10 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \
--program-prefix='' \
--with-innodb
+.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"
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
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 9654fa2795fe..7a36ca57d586 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -48,6 +48,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"
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 9654fa2795fe..7a36ca57d586 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -48,6 +48,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"
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 9654fa2795fe..7a36ca57d586 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -48,6 +48,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"
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 9654fa2795fe..7a36ca57d586 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -48,6 +48,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"
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 9654fa2795fe..7a36ca57d586 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -48,6 +48,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"
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 9654fa2795fe..7a36ca57d586 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -48,6 +48,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"
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 9654fa2795fe..7a36ca57d586 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -48,6 +48,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"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-30 15:11:19 +0000