summaryrefslogtreecommitdiff
path: root/databases/db3
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-11-15 17:54:49 +0000
committerjlam <jlam@pkgsrc.org>2004-11-15 17:54:49 +0000
commitb67b0725c487d6867521ee52db866b955f29d0fd (patch)
tree5579b0ab6b1d842e66a7d3075d37a9f9564a124e /databases/db3
parent8f9890fc252ddfbc4e7f77aea28c933fe28c5a81 (diff)
downloadpkgsrc-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/db3')
-rw-r--r--databases/db3/buildlink3.mk12
1 files changed, 5 insertions, 7 deletions
diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk
index 3f1205e779d..c0b26fd7bdd 100644
--- a/databases/db3/buildlink3.mk
+++ b/databases/db3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2004/10/03 00:13:18 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2004/11/15 17:54:49 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB3_BUILDLINK3_MK:= ${DB3_BUILDLINK3_MK}+
@@ -17,15 +17,13 @@ BUILDLINK_DEPENDS.db3+= db3>=2.9.2
BUILDLINK_RECOMMENDED.db3+= db3>=3.11.2nb3
BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3
BUILDLINK_INCDIRS.db3?= include/db3
-BUILDLINK_LIBDIRS.db3?= lib
+BUILDLINK_LDADD.db3= -ldb3
BUILDLINK_TRANSFORM+= l:db-3:db3
-USE_DB185?= yes
-. if !empty(USE_DB185:M[yY][eE][sS])
+
+. if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
+BUILDLINK_LIBS.db3= ${BUILDLINK_LDADD.db3}
BUILDLINK_TRANSFORM+= l:db:db3
-BUILDLINK_CPPFLAGS.db3= -I${BUILDLINK_PREFIX.db3}/${BUILDLINK_INCDIRS.db3}
. endif
-BUILDLINK_LDFLAGS.db3= -L${BUILDLINK_PREFIX.db3}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db3}/lib
-BUILDLINK_LIBS.db3= -ldb3
.endif # DB3_BUILDLINK3_MK
.include "../../mk/pthread.buildlink3.mk"