diff options
| author |   John Bowler <jbowler@nslu2-linux.org> | 2005-11-11 07:15:36 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-11-11 07:15:36 +0000 |
| commit | 1c60e3ea33243897f1159d617a0bf0fb9e5916f3 (patch) | |
| tree | 9c07ba79b1bd4132216ca513c55faf5df5a74c66 /packages/openldap | |
| parent | 82111b6f46d1afcb5d480fceaabc6822403e1867 (diff) | |
| download | openembedded-1c60e3ea33243897f1159d617a0bf0fb9e5916f3.tar.gz | |
db: fix db3/db4 confusion by causing all packages to use virtual/db in db-4.3 4.3.29
- The SleepyCat implementation of the Berkeley DB exists in OE in two different
- versions, 3.2 and 4.3. These appear to now be compatible (i.e. with the correct
- settings db-4.3 can do everything db-3.2 can do and all packages compile with it).
- The previous scheme of allowing both to be built (which was highly error prone)
- has been removed and all db users now reference virtual/db.
- Affects:
- bogofilter, cyrus-*, openldap, perl, postfix, rpm
Diffstat (limited to 'packages/openldap')
| -rw-r--r-- | packages/openldap/openldap_2.2.24.bb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/packages/openldap/openldap_2.2.24.bb b/packages/openldap/openldap_2.2.24.bb index a2fd912975..7c1f7f8b10 100644 --- a/packages/openldap/openldap_2.2.24.bb +++ b/packages/openldap/openldap_2.2.24.bb @@ -12,7 +12,7 @@ PRIORITY = "optional" LICENSE = "OpenLDAP" SECTION = "libs" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz" SRC_URI += " file://openldap-autoconf.patch;patch=1" @@ -89,16 +89,12 @@ md = "${libexecdir}/openldap" # To disable this set all three of the following variables to <empty> in # a .conf file (this will allow ldbm to be build with gdbm). OPENLDAP_OPTION_bdb ?= --enable-bdb=mod -OPENLDAP_DEPENDS_bdb ?= db4 +OPENLDAP_DEPENDS_bdb ?= db OPENLDAP_PACKAGE_bdb ?= "${PN}-backend-bdb" FILES_${PN}-backend-bdb = "${md}/back_bdb.so ${md}/back_bdb.la ${md}/back_bdb-*.so.*" EXTRA_OECONF += " ${OPENLDAP_OPTION_bdb}" DEPENDS += ${OPENLDAP_DEPENDS_bdb} PACKAGES += " ${OPENLDAP_PACKAGE_bdb}" -# For the moment the db4 headers are in a sub-directory to give compatibility -# with the identically named db3 headers in the standard staging directory, -# *prepend* the subdirectory: -TARGET_CPPFLAGS =+ "-I${STAGING_DIR}/${TARGET_SYS}/include/db4" # #--enable-dnssrv enable dnssrv backend no|yes|mod no # This has no dependencies. @@ -109,7 +105,7 @@ PACKAGES += " ${PN}-backend-dnssrv" #--enable-hdb enable Hierarchical DB backend no|yes|mod no # This forces ldbm to use Berkeley too, remove to use gdbm OPENLDAP_OPTION_hdb ?= --enable-hdb=mod -OPENLDAP_DEPENDS_hdb ?= db4 +OPENLDAP_DEPENDS_hdb ?= db OPENLDAP_PACKAGE_hdb ?= "${PN}-backend-hdb" FILES_${PN}-backend-hdb = "${md}/back_hdb.so ${md}/back_hdb.la ${md}/back_hdb-*.so.*" EXTRA_OECONF += " ${OPENLDAP_OPTION_hdb}" |