diff options
| author | tron <tron> | 2004-11-16 17:29:36 +0000 |
|---|---|---|
| committer | tron <tron> | 2004-11-16 17:29:36 +0000 |
| commit | 13579173f7db2c92fe10a774dc0b69d5302e2684 (patch) | |
| tree | b101e79fe34b8d88016a156fa1a8c7f98d313850 /databases/mysql-client | |
| parent | b372a4d0591b711a890e7487dc45d9402576d2fe (diff) | |
| download | pkgsrc-13579173f7db2c92fe10a774dc0b69d5302e2684.tar.gz | |
Make sure that "libmysqlclient.so" is not linked against "libpthread".
Bump package revision because of this changes. This fixes PR pkg/28313
by Jarle Greipsland.
Diffstat (limited to 'databases/mysql-client')
| -rw-r--r-- | databases/mysql-client/Makefile | 10 | ||||
| -rw-r--r-- | databases/mysql-client/Makefile.common | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile index 21e5151ed3e..d65586a93b2 100644 --- a/databases/mysql-client/Makefile +++ b/databases/mysql-client/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2004/11/12 14:19:07 xtraeme Exp $ +# $NetBSD: Makefile,v 1.36 2004/11/16 17:29:36 tron Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} SVR4_PKGNAME= mysqc -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= MySQL 4, a free SQL database (client) CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} @@ -17,6 +17,12 @@ UNWRAP_FILES= scripts/mysql_config INFO_FILES= mysql.info +post-configure: + ${SED} -e 's#${PTHREAD_CFLAGS}##g' -e 's#${PTHREAD_LDFLAGS}##g' \ + -e 's#${PTHREAD_LIBS}##g' ${WRKSRC}/libmysql/Makefile \ + >${WRKSRC}/libmysql/Makefile.new + ${MV} ${WRKSRC}/libmysql/Makefile.new ${WRKSRC}/libmysql/Makefile + post-install: ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index 4e3d1dc7566..0da85a2035f 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.30 2004/11/12 12:39:12 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.31 2004/11/16 17:29:36 tron Exp $ DISTNAME= mysql-4.0.22 CATEGORIES= databases @@ -70,8 +70,14 @@ 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 CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ |