diff options
| author | jlam <jlam> | 2004-11-15 17:54:49 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-11-15 17:54:49 +0000 |
| commit | 6732657e9b700bd4b49c74d66bb7fb40f46d3947 (patch) | |
| tree | 5579b0ab6b1d842e66a7d3075d37a9f9564a124e /mail/exim3 | |
| parent | 6bfb6f0a57769be79c33ec7a1a13d7b34fc16865 (diff) | |
| download | pkgsrc-6732657e9b700bd4b49c74d66bb7fb40f46d3947.tar.gz | |
Rework the Berkeley DB detection in buildlink3:
* Add a db1.builtin.mk file that detects whether DB-1.85 functionality
exists in the base system, and remove the distinction between
"native" and the other Berkeley DB packages -- we now refer to
db[1234]. This paves the way for any future databases/db1 package.
* USE_DB185 shouldn't need to be set by any packages -- its correct
value is now automatically determined by bdb.buildlink3.mk depending
on whether we explicitly request db1 or not. By default, if you
include bdb.buildlink3.mk, you want DB-1.85 functionality and
USE_DB185 defaults to "yes", but if you explicitly remove db1 from
the list of acceptable DBs, then USE_DB185 defaults to "no".
* Set BDB_LIBS to the library options needed to link against the DB
library when bdb.buildlink3.mk is included.
* We only add the DB library to the linker command automatically if
we want DB-1.85 functionality; otherwise assume that the package
configure process can figure out how to probe for the correct
headers and libraries.
Edit package Makefiles to nuke redundant settings of USE_DB185.
Diffstat (limited to 'mail/exim3')
| -rw-r--r-- | mail/exim3/Makefile | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile index 7a5615610e4..25fab10e86d 100644 --- a/mail/exim3/Makefile +++ b/mail/exim3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/10/29 05:59:24 jdolecek Exp $ +# $NetBSD: Makefile,v 1.15 2004/11/15 17:54:49 jlam Exp $ DISTNAME= exim-3.36 PKGREVISION= 3 @@ -18,7 +18,7 @@ USE_PERL5= YES USE_PKGINSTALL= YES BUILD_DEFS+= EXIM_USER EXIM_GROUP -BUILD_DEFS+= EXIM_DB.db1 EXIM_DB.mysql EXIM_DB.pgsql +BUILD_DEFS+= EXIM_DB.mysql EXIM_DB.pgsql PKG_SYSCONFSUBDIR?= exim EGDIR= ${PREFIX}/share/examples/exim @@ -42,14 +42,6 @@ FILES_SUBST+= GZCAT="${GZCAT}" _LOOKUP_LIBS+= ${LDFLAGS} -# default to using db1 on platforms which have it. -EXIM_DB.db1?= YES -.if ${EXIM_DB.db1} == "YES" -USE_DB185= YES -.endif -# does not compile with db4 -BDB_ACCEPTED= native db3 db2 - .if defined(EXIM_DB.mysql) && ${EXIM_DB.mysql} == "YES" LOOKUP_INCLUDE+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql LOOKUP_LIBS+= -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql @@ -66,11 +58,9 @@ MAKE_ENV+= LOOKUP_PGSQL=YES . include "../../mk/pgsql.buildlink3.mk" .endif -# buildlink3 decides which libdb to use on this platform. +BDB_ACCEPTED= db1 db3 db2 # does not compile with db4 .include "../../mk/bdb.buildlink3.mk" -DBMLIB+= ${BUILDLINK_CPPFLAGS.bdb} -DBMLIB+= ${BUILDLINK_LDFLAGS.bdb} -DBMLIB+= ${BUILDLINK_LIBS.bdb} +DBMLIB+= ${BDB_LIBS} MAKE_ENV+= DBMLIB=${DBMLIB:Q} MAKE_ENV+= LOOKUP_INCLUDE="${LOOKUP_INCLUDE}" |