diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-03-26 23:27:15 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-03-26 23:27:15 +0000 |
| commit | 4a0ac5cba00c454ad915b2dabe633c8c4a267c75 (patch) | |
| tree | df8b68e28af12cf34ba0a8319ee8002b00de4023 /databases | |
| parent | Upgrade to 3.23.56. (diff) | |
Under FreeBSD 5.X, libstdc++ and libsupc++ in /usr/lib use FreeBSD
native (libc_r style) mutexes, thus some of the linked application
might indirectly try to pass native style mutexes to linuxthreads
pthread functions, either hanging at program startup or overwriting
data following the native style mutex. <tegge>
Reviewed by: tegge
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql323-server/Makefile | 5 | ||||
| -rw-r--r-- | databases/mysql40-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql41-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql50-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql51-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql54-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql55-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql60-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/percona55-server/Makefile | 3 |
9 files changed, 20 insertions, 9 deletions
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index 2baf43e55f70..eead9343d6ad 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -57,11 +57,14 @@ CONFIGURE_ARGS+=--with-mysqld-ldflags=--static CFLAGS+= -mcpu=pentiumpro -O3 .endif .if defined(WITH_LINUXTHREADS) -CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r' +CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R +CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads .if ${OSVERSION} > 500000 +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads .else +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads .endif .endif diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 0a519bcc2c15..7f4a067cff34 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -71,13 +71,14 @@ CFLAGS+= -mcpu=i686 .if defined(WITH_LINUXTHREADS) CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads .if ${OSVERSION} > 500000 LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' .else LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' .endif .endif diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index 0a519bcc2c15..7f4a067cff34 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -71,13 +71,14 @@ CFLAGS+= -mcpu=i686 .if defined(WITH_LINUXTHREADS) CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads .if ${OSVERSION} > 500000 LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' .else LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' .endif .endif diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 0a519bcc2c15..7f4a067cff34 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -71,13 +71,14 @@ CFLAGS+= -mcpu=i686 .if defined(WITH_LINUXTHREADS) CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads .if ${OSVERSION} > 500000 LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' .else LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' .endif .endif diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 0a519bcc2c15..7f4a067cff34 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -71,13 +71,14 @@ CFLAGS+= -mcpu=i686 .if defined(WITH_LINUXTHREADS) CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads .if ${OSVERSION} > 500000 LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' .else LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' .endif .endif diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 0a519bcc2c15..7f4a067cff34 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -71,13 +71,14 @@ CFLAGS+= -mcpu=i686 .if defined(WITH_LINUXTHREADS) CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads .if ${OSVERSION} > 500000 LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' .else LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' .endif .endif diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 0a519bcc2c15..7f4a067cff34 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -71,13 +71,14 @@ CFLAGS+= -mcpu=i686 .if defined(WITH_LINUXTHREADS) CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads .if ${OSVERSION} > 500000 LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' .else LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' .endif .endif diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 0a519bcc2c15..7f4a067cff34 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -71,13 +71,14 @@ CFLAGS+= -mcpu=i686 .if defined(WITH_LINUXTHREADS) CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads .if ${OSVERSION} > 500000 LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' .else LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' .endif .endif diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 0a519bcc2c15..7f4a067cff34 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -71,13 +71,14 @@ CFLAGS+= -mcpu=i686 .if defined(WITH_LINUXTHREADS) CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads .if ${OSVERSION} > 500000 LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++' .else LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads +CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r' .endif .endif |