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/db4 | |
| 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/db4')
| -rw-r--r-- | databases/db4/buildlink3.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk index 507797a50ef..c0e36fb1ca4 100644 --- a/databases/db4/buildlink3.mk +++ b/databases/db4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2004/11/15 15:07:14 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2004/11/15 17:54:49 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+ @@ -17,19 +17,17 @@ BUILDLINK_DEPENDS.db4+= db4>=4.2.52 BUILDLINK_RECOMMENDED.db4+= db4>=4.2.52nb6 BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4 BUILDLINK_INCDIRS.db4?= include/db4 -BUILDLINK_LIBDIRS.db4?= lib +BUILDLINK_LDADD.db4= -ldb4 BUILDLINK_TRANSFORM+= l:db-4:db4 -USE_DB185?= yes -. if !empty(USE_DB185:M[yY][eE][sS]) + +. if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS]) # # Older db4 packages didn't enable the db-1.85 compatibility API. # BUILDLINK_DEPENDS.db4+= db4>=4.2.52nb1 +BUILDLINK_LIBS.db4= ${BUILDLINK_LDADD.db4} BUILDLINK_TRANSFORM+= l:db:db4 -BUILDLINK_CPPFLAGS.db4= -I${BUILDLINK_PREFIX.db4}/${BUILDLINK_INCDIRS.db4} . endif -BUILDLINK_LDFLAGS.db4= -L${BUILDLINK_PREFIX.db4}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib -BUILDLINK_LIBS.db4= -ldb4 .endif # DB4_BUILDLINK3_MK .include "../../mk/pthread.buildlink3.mk" |