diff options
| author | xtraeme <xtraeme> | 2004-11-16 18:01:58 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2004-11-16 18:01:58 +0000 |
| commit | cdda95bf8a7914668990bd10bfb4bbc7def0ad7c (patch) | |
| tree | 224c6b5903c3c8cbc007d07ead4ecc82066a1e20 /databases | |
| parent | 36939b700bfcca0acdc8aaede7fa3fccf10b2453 (diff) | |
| download | pkgsrc-cdda95bf8a7914668990bd10bfb4bbc7def0ad7c.tar.gz | |
Apply fix for PR pkg/28313 committed by tron@ on mysql-client some
minutes ago, but using subst.mk.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql4-client/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql4-client/Makefile.common | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile index c85d8958461..a3c3e6b9cb6 100644 --- a/databases/mysql4-client/Makefile +++ b/databases/mysql4-client/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2004/11/12 14:19:07 xtraeme Exp $ +# $NetBSD: Makefile,v 1.14 2004/11/16 18:01:58 xtraeme Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} -PKGREVISION= 3 +PKGREVISION= 4 SVR4_PKGNAME= mysqc COMMENT= MySQL 4, a free SQL database (client) diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index 83e42c038db..69114f92c75 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2004/11/12 12:39:12 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.23 2004/11/16 18:01:58 xtraeme Exp $ DISTNAME= mysql-4.1.7 CATEGORIES= databases @@ -70,7 +70,13 @@ CFLAGS+= -DHAVE_CURSES_H CXXFLAGS+= -DHAVE_CURSES_H .endif +SAVE_CFLAGS:= ${CFLAGS} +SAVE_CXXFLAGS:= ${CXXFLAGS} + .include "../../mk/pthread.buildlink3.mk" + +CFLAGS= ${SAVE_CFLAGS} +CXXFLAGS= ${SAVE_CXXFLAGS} .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") CFLAGS+= -DSIGNALS_DONT_BREAK_READ @@ -85,7 +91,7 @@ USE_PERL5= # defined USE_LIBTOOL= # defined LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql -SUBST_CLASSES+= mk scripts +SUBST_CLASSES+= mk scripts thr SUBST_STAGE.mk= post-extract SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in isam/Makefile.in \ merge/Makefile.in mysys/Makefile.in \ @@ -96,6 +102,11 @@ 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" |