pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk correctly set BDB_TYPE when native db is not availa...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/072302466b34
branches:  trunk
changeset: 475950:072302466b34
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun May 30 10:40:02 2004 +0000

description:
correctly set BDB_TYPE when native db is not available, eg. Solaris,
IRIX using the first BDB_ACCEPTED.

diffstat:

 mk/bdb.buildlink3.mk |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r 56f81d2fafbb -r 072302466b34 mk/bdb.buildlink3.mk
--- a/mk/bdb.buildlink3.mk      Sun May 30 10:32:18 2004 +0000
+++ b/mk/bdb.buildlink3.mk      Sun May 30 10:40:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bdb.buildlink3.mk,v 1.9 2004/05/26 20:26:29 wiz Exp $
+# $NetBSD: bdb.buildlink3.mk,v 1.10 2004/05/30 10:40:02 grant Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a Berkeley DB implementation.  bdb.buildlink3.mk will:
@@ -98,16 +98,14 @@
 .    for _bdb_ in ${_BDB_ACCEPTED}
 .      if !empty(_BDB_INSTALLED.${_bdb_}:M[yY][eE][sS])
 _BDB_TYPE?=    ${_bdb_}
-.      else
-_BDB_FIRSTACCEPTED?=   ${_bdb_}
 .      endif
 .    endfor
 #
 # ...otherwise, just use the first accepted Berkeley DB package.
 #
-.    if defined(_BDB_FIRSTACCEPTED)
-_BDB_TYPE?=    ${_BDB_FIRSTACCEPTED}
-.    endif
+.    for _bdb_ in ${_BDB_ACCEPTED:Nnative}
+_BDB_TYPE?=    ${_bdb_}
+.    endfor
 _BDB_TYPE?=    none
 MAKEFLAGS+=    _BDB_TYPE=${_BDB_TYPE}
 .  endif



Home | Main Index | Thread Index | Old Index