diff options
| author | jlam <jlam> | 2004-11-15 17:54:49 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-11-15 17:54:49 +0000 |
| commit | 5e87f5403ab4a3a339af8dbe4ad8bbd3e19a4633 (patch) | |
| tree | 5579b0ab6b1d842e66a7d3075d37a9f9564a124e /databases/p5-BerkeleyDB | |
| parent | 5cde1e054d6fd08fd768def974245fe4e2edf81e (diff) | |
| download | pkgsrc-5e87f5403ab4a3a339af8dbe4ad8bbd3e19a4633.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 'databases/p5-BerkeleyDB')
| -rw-r--r-- | databases/p5-BerkeleyDB/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile index f224dbb5e96..7e5f313bfa0 100644 --- a/databases/p5-BerkeleyDB/Makefile +++ b/databases/p5-BerkeleyDB/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/08/04 05:45:49 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2004/11/15 17:54:49 jlam Exp $ # DISTNAME= BerkeleyDB-0.25 @@ -20,7 +20,7 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/BerkeleyDB/.packlist MAKE_ENV+= BERKELEYDB_INCLUDE="${BDBBASE}/include" MAKE_ENV+= BERKELEYDB_LIB="${BDBBASE}/lib" -MAKE_ENV+= BERKELEYDB_NAME="${BUILDLINK_LIBS.bdb}" +MAKE_ENV+= BERKELEYDB_NAME="${BDB_LIBS}" .include "../../mk/bdb.buildlink3.mk" .include "../../lang/perl5/module.mk" |