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 /lang | |
| 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 'lang')
| -rw-r--r-- | lang/python20/Makefile | 4 | ||||
| -rw-r--r-- | lang/python23/Makefile.common | 8 |
2 files changed, 2 insertions, 10 deletions
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 diff --git a/lang/python23/Makefile.common b/lang/python23/Makefile.common index 32178a76d42..a42aff85ea9 100644 --- a/lang/python23/Makefile.common +++ b/lang/python23/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2004/10/30 16:17:53 grant Exp $ +# $NetBSD: Makefile.common,v 1.19 2004/11/15 17:54:49 jlam Exp $ # DISTNAME= Python-2.3.4 @@ -71,16 +71,10 @@ INSTALL_UNSTRIPPED= yes .endif # ensure that the bsddb185 module is built on all platforms -USE_DB185= yes .include "../../mk/bdb.buildlink3.mk" MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} - -.if ${BDB_TYPE} == "native" -MAKE_ENV+= PY_BDB_INCDIRS=/usr/${_BDB_INCDIRS} -.else MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}} MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib -.endif .if defined(BUILDLINK_TRANSFORM) MAKE_ENV+= PY_BDB_TRANSFORM="${BUILDLINK_TRANSFORM}" |