diff options
| author | wiz <wiz@pkgsrc.org> | 2006-03-02 20:49:39 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2006-03-02 20:49:39 +0000 |
| commit | 8d643056033f0577858b034b63cf12aed91ef863 (patch) | |
| tree | 0003ce349d009aaf9b1db3605c149c80bd141799 /mail | |
| parent | 024507b18e02b436135a908489d6e6fa9cb29ca8 (diff) | |
| download | pkgsrc-8d643056033f0577858b034b63cf12aed91ef863.tar.gz | |
Fix build both for mysql and pgsql backends.
Addresses second part of PR 32969 by Greg Oster.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/gld/distinfo | 4 | ||||
| -rw-r--r-- | mail/gld/options.mk | 6 | ||||
| -rw-r--r-- | mail/gld/patches/patch-aa | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/mail/gld/distinfo b/mail/gld/distinfo index a5231d0c111..0e84552869d 100644 --- a/mail/gld/distinfo +++ b/mail/gld/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2005/04/21 11:46:13 xtraeme Exp $ +$NetBSD: distinfo,v 1.11 2006/03/02 20:49:39 wiz Exp $ SHA1 (gld-1.5.2.tgz) = db6dd26df7645b62beec8cd5731359bb37f0258e RMD160 (gld-1.5.2.tgz) = 9e8b7f986eab14b001834d774e3624b8fd58cd48 Size (gld-1.5.2.tgz) = 39135 bytes -SHA1 (patch-aa) = 71bc915a5096a3d93cd7b5313f135b68312ec19a +SHA1 (patch-aa) = 3fca941c005bc37aa5275e9d0193c51f315b4212 SHA1 (patch-ab) = 629b99be25d536ceb646d47f079455a4b092fe24 SHA1 (patch-ac) = 8d484c0d6a5cbc88f2c4c66143e6aa9a91131bf1 SHA1 (patch-ad) = 1083bdc0040696a5ac014204c1a4a8e35fdeda53 diff --git a/mail/gld/options.mk b/mail/gld/options.mk index 0f41ee4b5a7..161ad586c82 100644 --- a/mail/gld/options.mk +++ b/mail/gld/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2006/03/02 20:41:30 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2006/03/02 20:49:39 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gld PKG_OPTIONS_REQUIRED_GROUPS= database @@ -10,9 +10,13 @@ PKG_SUGGESTED_OPTIONS= mysql .if !empty(PKG_OPTIONS:Mmysql) . include "../../mk/mysql.buildlink3.mk" CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} +LIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib \ + -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib -lmysqlclient .endif .if !empty(PKG_OPTIONS:Mpgsql) . include "../../mk/pgsql.buildlink3.mk" CONFIGURE_ARGS+= --with-pgsql=${BUILDLINK_PREFIX.postgresql-libs} +LIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib \ + -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib -lpq .endif diff --git a/mail/gld/patches/patch-aa b/mail/gld/patches/patch-aa index 58d1d7ea051..2dff6efd012 100644 --- a/mail/gld/patches/patch-aa +++ b/mail/gld/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2005/04/13 17:14:01 salo Exp $ +$NetBSD: patch-aa,v 1.6 2006/03/02 20:49:39 wiz Exp $ --- Makefile.in.orig 2004-10-12 14:41:49.000000000 +0200 +++ Makefile.in 2005-04-13 19:10:29.000000000 +0200 @@ -9,7 +9,7 @@ $NetBSD: patch-aa,v 1.5 2005/04/13 17:14:01 salo Exp $ - @CC@ -O2 @DEFS@ -Wall server.o sql.o sockets.o cnf.o greylist.o @LIBS@ @SQL_LIBS@ -o gld - strip gld + @CC@ -O2 @DEFS@ -Wall server.o sql.o sockets.o cnf.o greylist.o \ -+ $(LDFLAGS) -lmysqlclient -o gld ++ $(LDFLAGS) @SQL_LIBS@ -o gld sockets.o: sockets.c sockets.h @CC@ -O2 @DEFS@ -Wall -c sockets.c |