diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-15 17:54:49 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-15 17:54:49 +0000 |
| commit | b67b0725c487d6867521ee52db866b955f29d0fd (patch) | |
| tree | 5579b0ab6b1d842e66a7d3075d37a9f9564a124e /databases/db | |
| parent | 8f9890fc252ddfbc4e7f77aea28c933fe28c5a81 (diff) | |
| download | pkgsrc-b67b0725c487d6867521ee52db866b955f29d0fd.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/db')
| -rw-r--r-- | databases/db/buildlink3.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk index e1e20ddf51d..49d0fc9b8dc 100644 --- a/databases/db/buildlink3.mk +++ b/databases/db/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2004/10/03 00:13:18 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2004/11/15 17:54:49 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB_BUILDLINK3_MK:= ${DB_BUILDLINK3_MK}+ @@ -16,14 +16,13 @@ BUILDLINK_PACKAGES+= db2 BUILDLINK_DEPENDS.db2+= db>=2.7.3 BUILDLINK_RECOMMENDED.db2+= db>=2.7.7nb2 BUILDLINK_PKGSRCDIR.db2?= ../../databases/db -. if defined(USE_DB185) BUILDLINK_INCDIRS.db2?= include/db2 -BUILDLINK_LIBDIRS.db2?= lib +BUILDLINK_LDADD.db2= -ldb2 + +. if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS]) +BUILDLINK_LIBS.db2= ${BUILDLINK_LDADD.db2} BUILDLINK_TRANSFORM+= l:db:db2 -BUILDLINK_CPPFLAGS.db2= -I${BUILDLINK_PREFIX.db2}/${BUILDLINK_INCDIRS.db2} . endif -BUILDLINK_LDFLAGS.db2= -L${BUILDLINK_PREFIX.db2}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib -BUILDLINK_LIBS.db2= -ldb2 .endif # DB_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |