Attempt to fix the cyrus-sasl build failures, add its dependency on db3, and fix...

BKrev: 400dae5b1N2TRQ0xfD3CPZL5jX_nOw

diff --git a/cyrus-sasl/cyrus-sasl-2.1.15/configure.patch b/cyrus-sasl/cyrus-sasl-2.1.15/configure.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/cyrus-sasl/cyrus-sasl_2.1.15.oe b/cyrus-sasl/cyrus-sasl_2.1.15.oe
deleted file mode 100644 (file)
index 58bd122..0000000
--- a/cyrus-sasl/cyrus-sasl_2.1.15.oe
+++ /dev/null
@@ -1,39 +0,0 @@
-DEPENDS = virtual/libc
-RDEPENDS = libc6
-
-SRC_URI = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/cyrus-sasl-${PV}.tar.gz \
-         file://${FILESDIR}/configure.patch;patch=1
-
-inherit autotools libtool
-
-acpaths=-I ${S}/cmulocal -I ${S}/config -I .
-CFLAGS_append = ' -I${S}/include -I${S}/saslauthd/include'
-EXTRA_OECONF = --enable-shared --enable-static
-do_configure_prepend () {
-       rm -f acinclude.m4
-}
-
-do_compile_prepend () {
-       set -e
-       cd include
-       ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} makemd5.c -o makemd5
-       touch makemd5.o makemd5.lo makemd5
-       cd ..
-}
-
-do_stage () {
-       install -m 0644 lib/.libs/libsasl2.lai ${STAGING_LIBDIR}/libsasl2.la
-       install -m 0644 lib/.libs/libsasl2.a ${STAGING_LIBDIR}/libsasl2.a
-       install -m 0755 lib/.libs/libsasl2.so.2.0.15 ${STAGING_LIBDIR}/libsasl2.so.2.0.15
-       ln -sf libsasl2.so.2.0.15 ${STAGING_LIBDIR}/libsasl2.so.2
-       ln -sf libsasl2.so.2.0.15 ${STAGING_LIBDIR}/libsasl2.so
-       install -d ${STAGING_LIBDIR}/sasl
-       install -d ${STAGING_DIR}/target/include/sasl
-       install -m 0644 include/hmac-md5.h ${STAGING_DIR}/target/include/sasl/
-       install -m 0644 include/md5.h ${STAGING_DIR}/target/include/sasl/
-       install -m 0644 include/md5global.h ${STAGING_DIR}/target/include/sasl/
-       install -m 0644 include/sasl.h ${STAGING_DIR}/target/include/sasl/
-       install -m 0644 include/saslplug.h ${STAGING_DIR}/target/include/sasl/
-       install -m 0644 include/saslutil.h ${STAGING_DIR}/target/include/sasl/
-       install -m 0644 include/prop.h ${STAGING_DIR}/target/include/sasl/
-}

diff --git a/cyrus-sasl/cyrus-sasl_2.1.17.oe b/cyrus-sasl/cyrus-sasl_2.1.17.oe
index 2863c6e..bb0e4e8 100644 (file)
--- a/cyrus-sasl/cyrus-sasl_2.1.17.oe
+++ b/cyrus-sasl/cyrus-sasl_2.1.17.oe
@@ -1,14 +1,16 @@
-DEPENDS = virtual/libc
-RDEPENDS = libc6
+DEPENDS = virtual/libc db3
+RDEPENDS = libc6 db3
 
 SRC_URI = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \
          file://${FILESDIR}/configure.patch;patch=1
 
-inherit autotools
+inherit autotools libtool
 
 acpaths=-I ${S}/cmulocal -I ${S}/config -I .
 CFLAGS_append = ' -I${S}/include -I${S}/saslauthd/include'
-EXTRA_OECONF = --enable-shared --enable-static
+EXTRA_OECONF = '--enable-shared --enable-static --with-dblib=berkeley \
+               --with-bdb-libdir=${STAGING_LIBDIR} \
+               --with-bdb-incdir=${STAGING_INCDIR}'
 do_configure_prepend () {
        rm -f acinclude.m4
 }

diff --git a/db/db3_3.2.9.oe b/db/db3_3.2.9.oe
index 25e5063..651feb0 100644 (file)
--- a/db/db3_3.2.9.oe
+++ b/db/db3_3.2.9.oe
@@ -60,7 +60,7 @@ do_stage () {
        ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb-3.so
        ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb3.so
        ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb.so
-       install -m 0644 .libs/libdb-3.2.la ${STAGING_LIBDIR}/
+       install -m 0644 .libs/libdb-3.2.lai ${STAGING_LIBDIR}/libdb-3.2.la
        cd ${WORKDIR}/db-${PV}/build_unix_static
        install -m 0644 libdb.a ${STAGING_LIBDIR}/
        cd ${S}