diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-06-14 21:13:41 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-06-14 21:13:41 +0000 |
| commit | aff2c3704ce21bc5ec58c13560b629e1e6d1509b (patch) | |
| tree | 6ce1e29d70f5f5b12e84179aa3de1e2e0610dc3a /mail | |
| parent | 21aa5014e7e97b996236ff50a561e4702a3272e6 (diff) | |
| download | ports-aff2c3704ce21bc5ec58c13560b629e1e6d1509b.tar.gz ports-aff2c3704ce21bc5ec58c13560b629e1e6d1509b.zip | |
- Fix qmail-mysql build with clang and recent mysql-client
Reported by: miwi via pointyhat
Notes
Notes:
svn path=/head/; revision=320964
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/qmail-mysql/Makefile | 1 | ||||
| -rw-r--r-- | mail/qmail/Makefile | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile index a21a9ec85eaa..ea731e0a5f5f 100644 --- a/mail/qmail-mysql/Makefile +++ b/mail/qmail-mysql/Makefile @@ -16,7 +16,6 @@ MYSQL_PATCH_VERSION= 1.1.15 SLAVE_MYSQL= yes USE_MYSQL= yes -USE_GCC= any MASTERDIR= ${.CURDIR}/../qmail DESCR= ${.CURDIR}/pkg-descr diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index a9d8bee97a56..6355b5897403 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -679,7 +679,9 @@ post-patch: . endif .endif .if defined(SLAVE_MYSQL) - @${REINPLACE_CMD} 's|/opt/mysql|${LOCALBASE}|' \ + @${REINPLACE_CMD} \ + -e 's|/opt/mysql|${LOCALBASE}|' \ + -e "s,MYSQL_LIBS=.*,MYSQL_LIBS=\`${LOCALBASE}/bin/mysql_config --libs\`," \ ${WRKSRC}/Makefile .elif defined(SLAVE_SPAMCONTROL) @${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail |