diff options
| author | xtraeme <xtraeme> | 2004-11-23 16:07:01 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2004-11-23 16:07:01 +0000 |
| commit | 9bff14809cf15d94fd4f5edc6cc7ae5928fa2d1f (patch) | |
| tree | 17b6f873d11f7c18aedaa89c2010d605fb6339ba /databases/mysql4-client/Makefile.common | |
| parent | 9b03343ed3bc4820b8bb9de7390b313a3a9e29a7 (diff) | |
| download | pkgsrc-9bff14809cf15d94fd4f5edc6cc7ae5928fa2d1f.tar.gz | |
* Install my-{huge,large,innodb-heavy-4G,small,medium}.cnf example files.
* Use PTHREAD_AUTO_VARS=no to disable linking to libpthread all programs
and libraries, which is wrong.
* Set USE_LIBTOOL and GNU_CONFIGURE before including bsd.prefs.mk, so
the test for _OPSYS_MAX_CMDLEN is not skipped.
Bump PKGREVISION to each package respectively
(mysql-client and mysql4-client), closes PR pkg/28162 and PR pkg/28222.
Diffstat (limited to 'databases/mysql4-client/Makefile.common')
| -rw-r--r-- | databases/mysql4-client/Makefile.common | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index 8aaeff233f7..e51cf6d4a10 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.24 2004/11/16 18:56:29 tron Exp $ +# $NetBSD: Makefile.common,v 1.25 2004/11/23 16:07:02 xtraeme Exp $ DISTNAME= mysql-4.1.7 CATEGORIES= databases @@ -11,6 +11,10 @@ HOMEPAGE= http://www.mysql.com/ EXTRACT_USING_PAX= # defined +USE_BUILDLINK3= yes +USE_LIBTOOL= yes +GNU_CONFIGURE= yes + .include "../../mk/bsd.prefs.mk" # MYSQL_USER username of the database administrator @@ -27,8 +31,6 @@ MYSQL_DATADIR?= ${VARBASE}/mysql MYSQL_CHARSET?= latin1 MYSQL_EXTRA_CHARSET?= all -USE_BUILDLINK3= yes -GNU_CONFIGURE= yes CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR} CONFIGURE_ARGS+= --with-named-z-libs=z CONFIGURE_ARGS+= --without-libwrap @@ -70,6 +72,8 @@ CFLAGS+= -DHAVE_CURSES_H CXXFLAGS+= -DHAVE_CURSES_H .endif +PTHREAD_AUTO_VARS= no + .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") @@ -81,11 +85,10 @@ CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no USE_LANGUAGES= c c++ USE_GNU_TOOLS+= make -USE_PERL5= # defined -USE_LIBTOOL= # defined +USE_PERL5= yes LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql -SUBST_CLASSES+= mk scripts thr +SUBST_CLASSES+= mk scripts SUBST_STAGE.mk= post-extract SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in isam/Makefile.in \ merge/Makefile.in mysys/Makefile.in \ @@ -96,11 +99,6 @@ SUBST_STAGE.scripts= post-extract SUBST_FILES.scripts= scripts/mysql_install_db.sh scripts/mysqld_safe.sh SUBST_SED.scripts= -e "s,chown,${CHOWN},g" SUBST_MESSAGE.scripts= "Fixing scripts." -SUBST_STAGE.thr= post-configure -SUBST_FILES.thr= libmysql/Makefile -SUBST_SED.thr= -e "s,${PTHREAD_CFLAGS},,g" \ - -e "s,${PTHREAD_LDFLAGS},,g" \ - -e "s,${PTHREAD_LIBS},,g" .include "../../security/openssl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" |