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 /misc/rpm | |
| 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 'misc/rpm')
| -rw-r--r-- | misc/rpm/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index 531c15bd612..9686bfd97a7 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2004/10/03 00:13:00 tv Exp $ +# $NetBSD: Makefile,v 1.50 2004/11/15 17:54:49 jlam Exp $ DISTNAME= rpm-2.5.4 PKGREVISION= 3 @@ -14,7 +14,6 @@ BUILD_USES_MSGFMT= yes CONFLICTS+= rpm2cpio<1.0nb1 USE_BUILDLINK3= yes -USE_DB185= yes USE_GNU_TOOLS+= make GNU_CONFIGURE= yes @@ -28,8 +27,6 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR} # The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm. CONFIGURE_ENV+= varprefix="${RPM_DB_PREFIX}" -CFLAGS+= ${BUILDLINK_CPPFLAGS.db} - RPMDIR= ${RPM_DB_PREFIX}/lib/rpm FILES_SUBST+= RPMDIR=${RPMDIR} |