From c6a95a3a851f5dd0768d01622aeaa27969881c28 Mon Sep 17 00:00:00 2001 From: Norikatsu Shigemura Date: Tue, 25 Mar 2003 23:39:43 +0000 Subject: o Build thread-safe libs by default. o Fix pkg-plist. o Bump PORTREVISION accordingly. PR: ports/50293 Submitted by: Alex Dupre (maintainer) --- databases/mysql40-client/Makefile | 2 +- databases/mysql40-server/Makefile | 6 ++---- databases/mysql40-server/pkg-plist.client | 3 +++ databases/mysql41-client/Makefile | 2 +- databases/mysql41-server/Makefile | 6 ++---- databases/mysql41-server/pkg-plist.client | 3 +++ databases/mysql50-client/Makefile | 2 +- databases/mysql50-server/Makefile | 6 ++---- databases/mysql50-server/pkg-plist.client | 3 +++ databases/mysql51-client/Makefile | 2 +- databases/mysql51-server/Makefile | 6 ++---- databases/mysql51-server/pkg-plist.client | 3 +++ databases/mysql54-client/Makefile | 2 +- databases/mysql54-server/Makefile | 6 ++---- databases/mysql54-server/pkg-plist.client | 3 +++ databases/mysql55-client/Makefile | 2 +- databases/mysql55-server/Makefile | 6 ++---- databases/mysql55-server/pkg-plist.client | 3 +++ databases/mysql60-client/Makefile | 2 +- databases/mysql60-server/Makefile | 6 ++---- databases/mysql60-server/pkg-plist.client | 3 +++ databases/percona55-client/Makefile | 2 +- databases/percona55-server/Makefile | 6 ++---- databases/percona55-server/pkg-plist.client | 3 +++ 24 files changed, 48 insertions(+), 40 deletions(-) diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile index 48990cf60dcf..73538637c376 100644 --- a/databases/mysql40-client/Makefile +++ b/databases/mysql40-client/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -client MASTERDIR= ${.CURDIR}/../mysql40-server diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 7366666f55dd..0a519bcc2c15 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -44,7 +44,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --enable-thread-safe-client .include @@ -79,9 +80,6 @@ LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads .endif .endif -.if defined(THREAD_SAFE_CLIENT) -CONFIGURE_ARGS+=--enable-thread-safe-client -.endif CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti diff --git a/databases/mysql40-server/pkg-plist.client b/databases/mysql40-server/pkg-plist.client index b41d52e39413..42c5460fc13e 100644 --- a/databases/mysql40-server/pkg-plist.client +++ b/databases/mysql40-server/pkg-plist.client @@ -36,5 +36,8 @@ include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient_r.a +lib/mysql/libmysqlclient_r.so +lib/mysql/libmysqlclient_r.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile index 48990cf60dcf..73538637c376 100644 --- a/databases/mysql41-client/Makefile +++ b/databases/mysql41-client/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -client MASTERDIR= ${.CURDIR}/../mysql40-server diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index 7366666f55dd..0a519bcc2c15 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -44,7 +44,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --enable-thread-safe-client .include @@ -79,9 +80,6 @@ LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads .endif .endif -.if defined(THREAD_SAFE_CLIENT) -CONFIGURE_ARGS+=--enable-thread-safe-client -.endif CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti diff --git a/databases/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client index b41d52e39413..42c5460fc13e 100644 --- a/databases/mysql41-server/pkg-plist.client +++ b/databases/mysql41-server/pkg-plist.client @@ -36,5 +36,8 @@ include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient_r.a +lib/mysql/libmysqlclient_r.so +lib/mysql/libmysqlclient_r.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile index 48990cf60dcf..73538637c376 100644 --- a/databases/mysql50-client/Makefile +++ b/databases/mysql50-client/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -client MASTERDIR= ${.CURDIR}/../mysql40-server diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 7366666f55dd..0a519bcc2c15 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -44,7 +44,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --enable-thread-safe-client .include @@ -79,9 +80,6 @@ LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads .endif .endif -.if defined(THREAD_SAFE_CLIENT) -CONFIGURE_ARGS+=--enable-thread-safe-client -.endif CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti diff --git a/databases/mysql50-server/pkg-plist.client b/databases/mysql50-server/pkg-plist.client index b41d52e39413..42c5460fc13e 100644 --- a/databases/mysql50-server/pkg-plist.client +++ b/databases/mysql50-server/pkg-plist.client @@ -36,5 +36,8 @@ include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient_r.a +lib/mysql/libmysqlclient_r.so +lib/mysql/libmysqlclient_r.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile index 48990cf60dcf..73538637c376 100644 --- a/databases/mysql51-client/Makefile +++ b/databases/mysql51-client/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -client MASTERDIR= ${.CURDIR}/../mysql40-server diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 7366666f55dd..0a519bcc2c15 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -44,7 +44,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --enable-thread-safe-client .include @@ -79,9 +80,6 @@ LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads .endif .endif -.if defined(THREAD_SAFE_CLIENT) -CONFIGURE_ARGS+=--enable-thread-safe-client -.endif CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client index b41d52e39413..42c5460fc13e 100644 --- a/databases/mysql51-server/pkg-plist.client +++ b/databases/mysql51-server/pkg-plist.client @@ -36,5 +36,8 @@ include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient_r.a +lib/mysql/libmysqlclient_r.so +lib/mysql/libmysqlclient_r.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile index 48990cf60dcf..73538637c376 100644 --- a/databases/mysql54-client/Makefile +++ b/databases/mysql54-client/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -client MASTERDIR= ${.CURDIR}/../mysql40-server diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 7366666f55dd..0a519bcc2c15 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -44,7 +44,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --enable-thread-safe-client .include @@ -79,9 +80,6 @@ LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads .endif .endif -.if defined(THREAD_SAFE_CLIENT) -CONFIGURE_ARGS+=--enable-thread-safe-client -.endif CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti diff --git a/databases/mysql54-server/pkg-plist.client b/databases/mysql54-server/pkg-plist.client index b41d52e39413..42c5460fc13e 100644 --- a/databases/mysql54-server/pkg-plist.client +++ b/databases/mysql54-server/pkg-plist.client @@ -36,5 +36,8 @@ include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient_r.a +lib/mysql/libmysqlclient_r.so +lib/mysql/libmysqlclient_r.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index 48990cf60dcf..73538637c376 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -client MASTERDIR= ${.CURDIR}/../mysql40-server diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 7366666f55dd..0a519bcc2c15 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -44,7 +44,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --enable-thread-safe-client .include @@ -79,9 +80,6 @@ LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads .endif .endif -.if defined(THREAD_SAFE_CLIENT) -CONFIGURE_ARGS+=--enable-thread-safe-client -.endif CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client index b41d52e39413..42c5460fc13e 100644 --- a/databases/mysql55-server/pkg-plist.client +++ b/databases/mysql55-server/pkg-plist.client @@ -36,5 +36,8 @@ include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient_r.a +lib/mysql/libmysqlclient_r.so +lib/mysql/libmysqlclient_r.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile index 48990cf60dcf..73538637c376 100644 --- a/databases/mysql60-client/Makefile +++ b/databases/mysql60-client/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -client MASTERDIR= ${.CURDIR}/../mysql40-server diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 7366666f55dd..0a519bcc2c15 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -44,7 +44,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --enable-thread-safe-client .include @@ -79,9 +80,6 @@ LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads .endif .endif -.if defined(THREAD_SAFE_CLIENT) -CONFIGURE_ARGS+=--enable-thread-safe-client -.endif CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client index b41d52e39413..42c5460fc13e 100644 --- a/databases/mysql60-server/pkg-plist.client +++ b/databases/mysql60-server/pkg-plist.client @@ -36,5 +36,8 @@ include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient_r.a +lib/mysql/libmysqlclient_r.so +lib/mysql/libmysqlclient_r.so.12 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile index 48990cf60dcf..73538637c376 100644 --- a/databases/percona55-client/Makefile +++ b/databases/percona55-client/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -client MASTERDIR= ${.CURDIR}/../mysql40-server diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 7366666f55dd..0a519bcc2c15 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -44,7 +44,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-comment='FreeBSD port: ${PKGNAME}' + --with-comment='FreeBSD port: ${PKGNAME}' \ + --enable-thread-safe-client .include @@ -79,9 +80,6 @@ LIB_DEPENDS+= lthread.3:${PORTSDIR}/devel/linuxthreads LIB_DEPENDS+= lthread.2:${PORTSDIR}/devel/linuxthreads .endif .endif -.if defined(THREAD_SAFE_CLIENT) -CONFIGURE_ARGS+=--enable-thread-safe-client -.endif CFLAGS+= -O3 -fno-omit-frame-pointer CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client index b41d52e39413..42c5460fc13e 100644 --- a/databases/percona55-server/pkg-plist.client +++ b/databases/percona55-server/pkg-plist.client @@ -36,5 +36,8 @@ include/mysql/sslopt-vars.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient_r.a +lib/mysql/libmysqlclient_r.so +lib/mysql/libmysqlclient_r.so.12 @dirrm include/mysql @dirrm lib/mysql -- cgit v1.2.3