diff options
author | Dirk Froemberg <dirk@FreeBSD.org> | 1999-09-04 10:47:48 +0000 |
---|---|---|
committer | Dirk Froemberg <dirk@FreeBSD.org> | 1999-09-04 10:47:48 +0000 |
commit | 086e8241d0a729388ea56ff29ffb90b585376c28 (patch) | |
tree | c715b51a62a0b160eaeeec44705be6c95ba93505 /databases/mysql40-server/Makefile | |
parent | Update to xfmail 1.3.1 (diff) |
- If ${OSVERSION} >= 320000 then use native threads (libc_r) by default.
Set MIT_PTHREADS to use the supplied mit-pthreads.
This is a workaround for PR ports/12824.
- replace one occurance of gcc with ${CC}
- don't use CFLAGS twice somewhere in mit-pthreads compilation
(There is still one place left where CFLAGS are used twice.)
Notes
Notes:
svn path=/head/; revision=21233
Diffstat (limited to 'databases/mysql40-server/Makefile')
-rw-r--r-- | databases/mysql40-server/Makefile | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index bb5c94571cf6..551928682032 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -34,7 +34,6 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ CONFIGURE_ENV+= PERL=${PERL} \ PERL5=${PERL} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - CXXFLAGS="${CFLAGS}" \ CONFIGURE_ARGS="${CONFIGURE_ARGS}" .if !defined(CLIENT_ONLY) @@ -42,32 +41,54 @@ RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client .include <bsd.port.pre.mk> -.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 +.if ${OSVERSION} >= 320000 +.if defined(MIT_PTHREADS) +CONFIGURE_ARGS+= --with-mit-threads=yes + +pre-fetch: + @${ECHO} + @${ECHO} "Using supplied mit-pthreads." + @${ECHO} +.else CONFIGURE_ARGS+= --with-mit-threads=no + +pre-fetch: + @${ECHO} + @${ECHO} "Using native FreeBSD threads (libc_r)." + @${ECHO} + @${ECHO} "You may set MIT_PTHREADS (make MIT_PTHREADS=yes)" + @${ECHO} "to compile mysql with the supplied mit-pthreads." + @${ECHO} "(You don't want to set this unless you have a good reason)." + @${ECHO} +.endif +.elif ${OSVERSION} >= 300000 +.if defined(NATIVE_THREADS) +CONFIGURE_ARGS+= --with-mit-threads=no + +pre-fetch: + @${ECHO} + @${ECHO} "Using native FreeBSD threads (libc_r)." + @${ECHO} .else CONFIGURE_ARGS+= --with-mit-threads=yes -.endif -.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 pre-fetch: @${ECHO} + @${ECHO} "Using supplied mit-pthreads." + @${ECHO} @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)" @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)." - @${ECHO} "Warning: There are still some bugs in libc_r which prevent" + @${ECHO} "Warning: There are some bugs in libc_r which prevent" @${ECHO} " 'mysqladmin shutdown' from working properly and" @${ECHO} " killing mysqld might not work." @${ECHO} -.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000 -pre-fetch: - @${ECHO} - @${ECHO} "Using native FreeBSD threads (libc_r)." - @${ECHO} -.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000 +.endif +.else +CONFIGURE_ARGS+= --with-mit-threads=yes + pre-fetch: @${ECHO} - @${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch" - @${ECHO} "are still too buggy to use with mysql." - @${ECHO} "Using mit-pthreads." + @${ECHO} "Using supplied mit-pthreads." @${ECHO} .endif |