diff options
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | recipes/libc-client/libc-client_2007b.bb (renamed from recipes/libc-client/libc-client_2007a1.bb) | 15 | ||||
| -rw-r--r-- | recipes/php/php-5.2.11/imap-fix-autofoo.patch | 41 | ||||
| -rw-r--r-- | recipes/php/php_5.2.11.bb | 8 |
4 files changed, 59 insertions, 9 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index da88fc2fa9..f7b44d4d56 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -12422,6 +12422,10 @@ sha256=76167e10c30d60534dc2b04fa4e202e16531df8170fc23cc4414d9afff09c32a md5=828a84c64ef933bfcc805b838576a774 sha256=8ba0eda3157193643eb3c5ccd46c0ca8060d702f260df60f89656cb891cbeeb8 +[ftp://ftp.cac.washington.edu/imap/imap-2007b.tar.Z] +md5=4d59ce6303cf8ef93ff51341b1ce2df7 +sha256=b3170bef59f416be1f710be58333f9b0c2c8b0fe137062accd4f5f13a3785cd0 + [http://downloads.sourceforge.net/imdbpy/imdbpy-2.5.tar.gz] md5=dbbb53f835fd3f7aebcf7601dd902920 sha256=edaad2859a4f0785a34c3c0bb5a1e09d8f16efa3c0e4616f6a5a6cf18c282aa6 diff --git a/recipes/libc-client/libc-client_2007a1.bb b/recipes/libc-client/libc-client_2007b.bb index b337a344a7..bacc910a13 100644 --- a/recipes/libc-client/libc-client_2007a1.bb +++ b/recipes/libc-client/libc-client_2007b.bb @@ -1,13 +1,13 @@ DESCRIPTION = "UW c-client library for mail protocols" SECTION = "devel" PRIORITY = "optional" -LICENSE = "University of Washington's Free-Fork License" -DEPENDS = "libpam openssl" +LICENSE = "University of Washingtons Free-Fork License" +DEPENDS = "libpam openssl libpam" SRC_URI = "ftp://ftp.cac.washington.edu/imap/imap-${PV}.tar.Z \ file://quote_cctype.patch;patch=1" -S = "${WORKDIR}/imap-2007a" +S = "${WORKDIR}/imap-${PV}" EXTRA_OEMAKE = "CC='${CC}'" @@ -18,9 +18,10 @@ do_compile() { oe_runmake lnp } -do_stage() { - install -d ${STAGING_INCDIR}/c-client - install ${HEADERS} ${STAGING_INCDIR}/c-client - install c-client/c-client.a ${STAGING_LIBDIR}/libc-client.a +do_install() { + install -d ${D}${includedir}/c-client + install ${HEADERS} ${D}${includedir}/c-client + install -d ${D}${libdir} + install c-client/c-client.a ${D}${libdir}/libc-client.a } diff --git a/recipes/php/php-5.2.11/imap-fix-autofoo.patch b/recipes/php/php-5.2.11/imap-fix-autofoo.patch new file mode 100644 index 0000000000..3695b7bc42 --- /dev/null +++ b/recipes/php/php-5.2.11/imap-fix-autofoo.patch @@ -0,0 +1,41 @@ +Index: php-5.2.11/ext/imap/config.m4 +=================================================================== +--- php-5.2.11.orig/ext/imap/config.m4 2009-12-10 12:27:52.800974533 -0700 ++++ php-5.2.11/ext/imap/config.m4 2009-12-10 12:28:33.720976583 -0700 +@@ -103,7 +103,7 @@ + PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared) + AC_DEFINE(HAVE_IMAP,1,[ ]) + +- for i in $PHP_IMAP /usr/local /usr; do ++ for i in $PHP_IMAP $PHP_IMAP/usr /usr/local /usr; do + IMAP_INC_CHK() + el[]IMAP_INC_CHK(/include/c-client) + el[]IMAP_INC_CHK(/include/imap) +@@ -192,13 +192,7 @@ + AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) + fi + +- if test -r "$IMAP_DIR/c-client/c-client.a"; then +- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 +- elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then +- ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1 +- fi +- +- for lib in c-client4 c-client imap; do ++ for lib in /usr/lib c-client4 c-client imap; do + IMAP_LIB=$lib + IMAP_LIB_CHK($PHP_LIBDIR) + IMAP_LIB_CHK(c-client) +Index: php-5.2.11/acinclude.m4 +=================================================================== +--- php-5.2.11.orig/acinclude.m4 2009-12-10 12:37:13.134722881 -0700 ++++ php-5.2.11/acinclude.m4 2009-12-10 12:37:39.342007053 -0700 +@@ -2338,7 +2338,7 @@ + PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" + fi + +- for i in $PHP_OPENSSL_DIR; do ++ for i in $PHP_OPENSSL_DIR $PHP_OPENSSL_DIR/usr; do + if test -r $i/include/openssl/evp.h; then + OPENSSL_INCDIR=$i/include + fi diff --git a/recipes/php/php_5.2.11.bb b/recipes/php/php_5.2.11.bb index d4fd98597a..058f1c2554 100644 --- a/recipes/php/php_5.2.11.bb +++ b/recipes/php/php_5.2.11.bb @@ -1,10 +1,12 @@ require php.inc -DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql" +DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql \ + libc-client openssl" -PR = "r1" +PR = "r2" SRC_URI += "file://pear-makefile.patch;patch=1 \ + file://imap-fix-autofoo.patch;patch=1 \ " export THREADS="pthread" export LIBS=" -lpthread " @@ -20,6 +22,8 @@ EXTRA_OECONF = " --without-iconv \ --enable-embedded-mysqli \ --enable-magic-quotes \ --enable-fastcgi \ + --with-imap=${STAGING_DIR_HOST} \ + --with-imap-ssl=${STAGING_DIR_HOST} \ --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ --with-libxml-dir=${STAGING_BINDIR_CROSS} \ --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \ |