From b67b0725c487d6867521ee52db866b955f29d0fd Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 15 Nov 2004 17:54:49 +0000 Subject: 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. --- lang/python20/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lang/python20') diff --git a/lang/python20/Makefile b/lang/python20/Makefile index e5d0e5a75f1..8a5a2524f2b 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/10/31 13:23:03 recht Exp $ +# $NetBSD: Makefile,v 1.23 2004/11/15 17:54:49 jlam Exp $ # DISTNAME= Python-2.0.1 @@ -24,8 +24,6 @@ USE_BUILDLINK3= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-threads INSTALL_TARGET= altinstall -# ensure that the bsddb185 module is built on all platforms -USE_DB185= yes # Make sure having environment variable OPT doesn't affect the # installed module-building Makefile -- cgit v1.2.3