BUGFIX: correct the do_stage method of the cyrus-sasl builds, in preparation for...

BKrev: 400764dalxI1pKVuIgj8EoJMXyz5Vg

diff --git a/cyrus-sasl/cyrus-sasl_2.1.15.oe b/cyrus-sasl/cyrus-sasl_2.1.15.oe
index 086fabc..e244577 100644 (file)
--- a/cyrus-sasl/cyrus-sasl_2.1.15.oe
+++ b/cyrus-sasl/cyrus-sasl_2.1.15.oe
@@ -4,11 +4,11 @@ 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
+inherit autotools libtool
 
 acpaths=-I ${S}/cmulocal -I ${S}/config -I .
 CFLAGS_append = ' -I${S}/include -I${S}/saslauthd/include'
-EXTRA_OECONF = --enable-shared
+EXTRA_OECONF = --enable-shared --enable-static
 do_compile_prepend () {
        set -e
        cd include
@@ -18,8 +18,11 @@ do_compile_prepend () {
 }
 
 do_stage () {
-       install -m 0644 lib/libsasl2.la ${STAGING_LIBDIR}/
-       install -m 0644 lib/libsasl2.a ${STAGING_LIBDIR}/
+       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/

diff --git a/cyrus-sasl/cyrus-sasl_2.1.17.oe b/cyrus-sasl/cyrus-sasl_2.1.17.oe
index e69de29..d180b14 100644 (file)
--- a/cyrus-sasl/cyrus-sasl_2.1.17.oe
+++ b/cyrus-sasl/cyrus-sasl_2.1.17.oe
@@ -0,0 +1,35 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \
+         file://${FILESDIR}/configure.patch;patch=1
+
+inherit autotools
+
+acpaths=-I ${S}/cmulocal -I ${S}/config -I .
+CFLAGS_append = ' -I${S}/include -I${S}/saslauthd/include'
+EXTRA_OECONF = --enable-shared --enable-static
+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.17 ${STAGING_LIBDIR}/libsasl2.so.2.0.17
+       ln -sf libsasl2.so.2.0.17 ${STAGING_LIBDIR}/libsasl2.so.2
+       ln -sf libsasl2.so.2.0.17 ${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/
+}