FreeBSD Bugzilla – Attachment 59142 Details for
Bug 89023
USE_BDB doesn't set name of Berkely dB, or location of the include directory
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
databases.diff
databases.diff (text/plain), 4.07 KB, created by
Scot Hetzel
on 2005-11-18 16:06:03 UTC
(
hide
)
Description:
databases.diff
Filename:
MIME Type:
Creator:
Scot Hetzel
Created:
2005-11-18 16:06:03 UTC
Size:
4.07 KB
patch
obsolete
>Index: Mk/bsd.database.mk >=================================================================== >RCS file: /home/ncvs/ports/Mk/bsd.database.mk,v >retrieving revision 1.2 >diff -u -r1.2 bsd.database.mk >--- Mk/bsd.database.mk 11 Nov 2005 10:29:21 -0000 1.2 >+++ Mk/bsd.database.mk 18 Nov 2005 16:25:21 -0000 >@@ -52,6 +52,19 @@ > # by the user via defined variable), try to find the > # currently installed version. Fall back to default if > # necessary (db41+). >+# BROKEN_WITH_BDB - This variable can be defined when the port doesn't >+# support one or more versions of Berkley DB. >+# WANT_BDB_VER - Maintainer can set a version of Berkley DB to always >+# build this port with (overrides WITH_BDB_VER). >+# WITH_BDB_VER - User defined variable to set Berkley DB version. >+# BDB_LIB_NAME - This variable is automatically set to the name of the >+# Berkley DB library (default: db41) >+# BDB_LIB_CXX_NAME - This variable is automatically set to the name of the >+# Berkley DB c++ library (default: db41_cxx) >+# BDB_INCLUDE_DIR - This variable is automatically set to the location of >+# the Berkley DB include directory. >+# (default: ${LOCALBASE}/include/db41) >+# > ## > # USE_SQLITE - Add dependency on sqlite library. Valid values are: > # 3 and 2. If version is not specified directly then >@@ -170,6 +183,13 @@ > _DB_41P= 41 42 43 > _DB_42P= 42 43 > >+.if defined(WITH_BDB_VER) >+. if ${WITH_BDB_VER} == 4 >+USE_BDB= 40 >+. elif ${WITH_BDB_VER} != 1 >+USE_BDB= ${WITH_BDB_VER} >+. endif >+.endif > _WANT_BDB_VER= ${USE_BDB} > > # Assume the default bdb version as 41 >@@ -179,34 +199,92 @@ > > # Detect bdb version > _FOUND= no >+_BDB_BROKEN= no > >+# Override the user defined WITH_BDB_VER with the WANT_BDB_VER >+.if defined(WANT_BDB_VER) >+.for bdb in ${_DB_PORTS} >+.if ${WANT_BDB_VER} == "${bdb}" && ${_FOUND} == "no" >+_FOUND= ${WANT_BDB_VER} >+.endif >+.endfor >+USE_BDB= ${WANT_BDB_VER} >+.else > .for bdb in ${_DB_PORTS} > .if ${_WANT_BDB_VER} == "${bdb}" && ${_FOUND} == "no" > _MATCHED_DB_VER:= ${bdb:S/+//} > . if ${_MATCHED_DB_VER} == "${bdb}" > # USE_BDB is exactly specified >-LIB_DEPENDS+= ${db${bdb}_DEPENDS} >-_FOUND= yes >+_FOUND= ${bdb} > .else > # USE_BDB is specified as VER+ > . for db4 in ${_DB_${_MATCHED_DB_VER}P} > . if exists(${db${db4}_FIND}) && ${_FOUND} == "no" >-LIB_DEPENDS+= ${db${db4}_DEPENDS} >-_FOUND= yes >+_FOUND= ${db4} > . endif > . endfor > . if ${_FOUND} == "no" > # No existing db4 version is detected in system >-LIB_DEPENDS+= ${db${_MATCHED_DB_VER}_DEPENDS} >-_FOUND= yes >+_FOUND= ${_MATCHED_DB_VER} > . endif > . endif > .endif > .endfor >+.endif > > # USE_BDB is specified incorrectly, so mark this as IGNORE > .if ${_FOUND} == "no" > IGNORE= "Unknown bdb version: ${USE_BDB}" >+.else >+# Now check if we can use it >+. if defined(BROKEN_WITH_BDB) >+. for VER in ${BROKEN_WITH_BDB} >+. if ${_FOUND} == "${VER}" >+_BDB_BROKEN= yes >+. endif >+. endfor >+. endif >+. if ${_BDB_BROKEN} == "yes" >+IGNORE= "Does not work with Berkley DB ${_FOUND} \(${BROKEN_WITH_BDB} not supported\)" >+. else >+# Now add the dependancy on Berkley DB ${_FOUND) version >+LIB_DEPENDS+= ${db${_FOUND}_DEPENDS} >+. if ${_FOUND} == 40 >+BDB_LIB_NAME= db4 >+BDB_LIB_CXX_NAME= db4_cxx >+BDB_INCLUDE_DIR= ${LOCALBASE}/include/db4 >+. elif ${_FOUND} == 42 >+BDB_LIB_NAME= db-4.2 >+BDB_LIB_CXX_NAME= db_cxx-4.2 >+BDB_LIB_DIR= ${LOCALBASE}/lib/db42 >+. elif ${_FOUND} == 43 >+BDB_LIB_NAME= db-4.3 >+BDB_LIB_CXX_NAME= db_cxx-4.3 >+BDB_LIB_DIR= ${LOCALBASE}/lib/db43 >+. endif >+BDB_LIB_NAME?= db${_FOUND} >+BDB_LIB_CXX_NAME?= db${_FOUND}_cxx >+BDB_INCLUDE_DIR?= ${LOCALBASE}/include/db${_FOUND} >+BDB_LIB_DIR?= ${LOCALBASE}/lib >+. endif >+.endif >+ >+# Obsolete variables >+.for var in DB DB2 DB3 DB4 DB40 DB41 DB42 DB43 BDB2 BDB3 BDB4 BDB40 BDB41 BDB42 BDB43 >+.if defined(WITH_${var}) >+BAD_VAR+=" WITH_${var}," >+.endif >+.if defined(USE_${var}) >+BAD_VAR+==" USE_${var}," >+.endif >+.endfor >+.for var in BERKELEYDB_PORT BERKELEYDB_LIB SENDMAIL_WITH_BERKELEYDB_VER >+.if defined(${var}) >+BAD_VAR+=" ${var}," >+.endif >+.endfor >+.if defined(BAD_VAR) >+IGNORE="Obsolete variable(s)${BAD_VAR} use WITH_BDB_VER instead" > .endif > > .endif # USE_BDB > > > > > > > > > > >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 89023
:
59139
|
59140
|
59141
| 59142 |
59143
|
59144
|
59145
|
59146
|
59147
|
59148
|
59149