From 4c2a2a7af095761bb214f1fee46bb2a852e9f776 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 5 Mar 2010 01:10:09 +0100 Subject: php: Upgrade from php 5.1.12 to 5.1.13 --- recipes/php/php-5.2.12/acinclude-xml2-config.patch | 18 ---- recipes/php/php-5.2.12/imap-fix-autofoo.patch | 41 --------- recipes/php/php-5.2.12/pear-makefile.patch | 13 --- recipes/php/php-5.2.13/acinclude-xml2-config.patch | 18 ++++ recipes/php/php-5.2.13/imap-fix-autofoo.patch | 41 +++++++++ recipes/php/php-5.2.13/pear-makefile.patch | 13 +++ recipes/php/php_5.2.12.bb | 97 ---------------------- recipes/php/php_5.2.13.bb | 97 ++++++++++++++++++++++ 8 files changed, 169 insertions(+), 169 deletions(-) delete mode 100644 recipes/php/php-5.2.12/acinclude-xml2-config.patch delete mode 100644 recipes/php/php-5.2.12/imap-fix-autofoo.patch delete mode 100644 recipes/php/php-5.2.12/pear-makefile.patch create mode 100644 recipes/php/php-5.2.13/acinclude-xml2-config.patch create mode 100644 recipes/php/php-5.2.13/imap-fix-autofoo.patch create mode 100644 recipes/php/php-5.2.13/pear-makefile.patch delete mode 100644 recipes/php/php_5.2.12.bb create mode 100644 recipes/php/php_5.2.13.bb diff --git a/recipes/php/php-5.2.12/acinclude-xml2-config.patch b/recipes/php/php-5.2.12/acinclude-xml2-config.patch deleted file mode 100644 index bf519d2934..0000000000 --- a/recipes/php/php-5.2.12/acinclude-xml2-config.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200 -+++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200 -@@ -2359,12 +2359,9 @@ - AC_DEFUN([PHP_SETUP_LIBXML], [ - AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, - [ -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done -+ -+ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config" -+ - ]) - - if test -x "$ac_cv_php_xml2_config_path"; then diff --git a/recipes/php/php-5.2.12/imap-fix-autofoo.patch b/recipes/php/php-5.2.12/imap-fix-autofoo.patch deleted file mode 100644 index 3695b7bc42..0000000000 --- a/recipes/php/php-5.2.12/imap-fix-autofoo.patch +++ /dev/null @@ -1,41 +0,0 @@ -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.12/pear-makefile.patch b/recipes/php/php-5.2.12/pear-makefile.patch deleted file mode 100644 index 487f507a02..0000000000 --- a/recipes/php/php-5.2.12/pear-makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: php-5.2.11/pear/Makefile.frag -=================================================================== ---- php-5.2.11.orig/pear/Makefile.frag 2009-08-02 13:11:15.000000000 -0600 -+++ php-5.2.11/pear/Makefile.frag 2009-12-09 16:13:38.700972014 -0700 -@@ -11,7 +11,7 @@ - PEAR_SUFFIX = -ds a$(program_suffix) - - install-pear-installer: $(SAPI_CLI_PATH) -- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} -+ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} - - install-pear: - @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/recipes/php/php-5.2.13/acinclude-xml2-config.patch b/recipes/php/php-5.2.13/acinclude-xml2-config.patch new file mode 100644 index 0000000000..bf519d2934 --- /dev/null +++ b/recipes/php/php-5.2.13/acinclude-xml2-config.patch @@ -0,0 +1,18 @@ +--- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200 ++++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200 +@@ -2359,12 +2359,9 @@ + AC_DEFUN([PHP_SETUP_LIBXML], [ + AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, + [ +- for i in $PHP_LIBXML_DIR /usr/local /usr; do +- if test -x "$i/bin/xml2-config"; then +- ac_cv_php_xml2_config_path="$i/bin/xml2-config" +- break +- fi +- done ++ ++ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config" ++ + ]) + + if test -x "$ac_cv_php_xml2_config_path"; then diff --git a/recipes/php/php-5.2.13/imap-fix-autofoo.patch b/recipes/php/php-5.2.13/imap-fix-autofoo.patch new file mode 100644 index 0000000000..3695b7bc42 --- /dev/null +++ b/recipes/php/php-5.2.13/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.13/pear-makefile.patch b/recipes/php/php-5.2.13/pear-makefile.patch new file mode 100644 index 0000000000..487f507a02 --- /dev/null +++ b/recipes/php/php-5.2.13/pear-makefile.patch @@ -0,0 +1,13 @@ +Index: php-5.2.11/pear/Makefile.frag +=================================================================== +--- php-5.2.11.orig/pear/Makefile.frag 2009-08-02 13:11:15.000000000 -0600 ++++ php-5.2.11/pear/Makefile.frag 2009-12-09 16:13:38.700972014 -0700 +@@ -11,7 +11,7 @@ + PEAR_SUFFIX = -ds a$(program_suffix) + + install-pear-installer: $(SAPI_CLI_PATH) +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} ++ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} + + install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/recipes/php/php_5.2.12.bb b/recipes/php/php_5.2.12.bb deleted file mode 100644 index 9ae606bdc5..0000000000 --- a/recipes/php/php_5.2.12.bb +++ /dev/null @@ -1,97 +0,0 @@ -require php.inc - -DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ - libc-client openssl" - -PR = "r4" - -SRC_URI += "file://pear-makefile.patch;patch=1 \ - file://imap-fix-autofoo.patch;patch=1 \ - " -SRC_URI[src.md5sum] = "5b7077e366c7eeab34da31dd860a1923" -SRC_URI[src.sha256sum] = "e65756a8412726a491ca48da1e0693eaeb3f38f19fb6cbc8f53005cab1f2491a" - -export THREADS="pthread" -export LIBS=" -lpthread " - -EXTRA_OECONF = " --without-iconv \ - --enable-mbstring \ - --enable-discard-path \ - --enable-sockets \ - --enable-shared \ - --enable-pcntl \ - --enable-memory-limit \ - --enable-wddx \ - --disable-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}" \ - --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \ - --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \ - --without-pdo-sqlite \ - " - -export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" -export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" -export PHP_PEAR_PHP_BIN = "${bindir}/php" - -#LDFLAGS += "-lstdc++" - -do_configure_append() { - find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' -} - -# fixme -do_install_append() { - mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ${D}/${sysconfdir} - rm -rf ${D}/${STAGING_DIR_NATIVE} - rm -rf ${D}/.registry - rm -rf ${D}/.channels - rm -rf ${D}/.[a-z]* -} - -PACKAGES = "${PN}-dbg \ - ${PN}-cli \ - ${PN}-cgi \ - ${PN}-pear \ - ${PN}-dev \ - ${PN}-doc \ - ${PN} \ -" - - -FILES_${PN}-dbg =+ "${bindir}/.debug" - -FILES_${PN}-doc += "${libdir}/php/doc" - -FILES_${PN}-cli = "${bindir}/php" -FILES_${PN}-cgi = "${bindir}/php-cgi" - -FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl \ - ${libdir}/php/PEAR \ - ${libdir}/php/PEAR.php \ - ${libdir}/php/System.php ${libdir}php/peclcmd.php ${libdir}/php/pearcmd.php \ - ${libdir}/php/.channels ${libdir}/php/.channels/.alias \ - ${libdir}/php/.channels\__uri.reg \ - ${libdir}/php/.channels\pear.php.net.reg ${libdir}/php/.channels/pecl.php.net.reg \ - ${libdir}/php/.registry \ - ${libdir}/php/Archive/Tar.php \ - ${libdir}/php/Console/Getopt.php ${libdir}/php/OS/Guess.php \ - ${sysconfdir}/pear.conf" - - -FILES_${PN}-dev = "${includedir}/php ${libdir}/build \ - ${bindir}/phpize ${bindir}/php-config \ - ${libdir}/php/.depdb ${libdir}/php/.depdblock ${libdir}/php/.filemap ${libdir}/php/.lock \ - ${libdir}/php/test " - -FILES_${PN} = "${libdir}/php" -FILES_${PN} += "${bindir}" - -RDEPENDS_${PN}-pear = ${PN} -RDEPENDS_${PN}-cli = ${PN} -RDEPENDS_${PN}-dev = ${PN} diff --git a/recipes/php/php_5.2.13.bb b/recipes/php/php_5.2.13.bb new file mode 100644 index 0000000000..97b68baf6e --- /dev/null +++ b/recipes/php/php_5.2.13.bb @@ -0,0 +1,97 @@ +require php.inc + +DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ + libc-client openssl" + +PR = "r4" + +SRC_URI += "file://pear-makefile.patch;patch=1 \ + file://imap-fix-autofoo.patch;patch=1 \ + " +SRC_URI[src.md5sum] = "eb4d0766dc4fb9667f05a68b6041e7d1" +SRC_URI[src.sha256sum] = "2b50a2535e3bb9a98cd4d1633f9452d877276c40b385915261f040d535c7eadb" + +export THREADS="pthread" +export LIBS=" -lpthread " + +EXTRA_OECONF = " --without-iconv \ + --enable-mbstring \ + --enable-discard-path \ + --enable-sockets \ + --enable-shared \ + --enable-pcntl \ + --enable-memory-limit \ + --enable-wddx \ + --disable-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}" \ + --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \ + --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \ + --without-pdo-sqlite \ + " + +export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" +export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" +export PHP_PEAR_PHP_BIN = "${bindir}/php" + +#LDFLAGS += "-lstdc++" + +do_configure_append() { + find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' +} + +# fixme +do_install_append() { + mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ${D}/${sysconfdir} + rm -rf ${D}/${STAGING_DIR_NATIVE} + rm -rf ${D}/.registry + rm -rf ${D}/.channels + rm -rf ${D}/.[a-z]* +} + +PACKAGES = "${PN}-dbg \ + ${PN}-cli \ + ${PN}-cgi \ + ${PN}-pear \ + ${PN}-dev \ + ${PN}-doc \ + ${PN} \ +" + + +FILES_${PN}-dbg =+ "${bindir}/.debug" + +FILES_${PN}-doc += "${libdir}/php/doc" + +FILES_${PN}-cli = "${bindir}/php" +FILES_${PN}-cgi = "${bindir}/php-cgi" + +FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl \ + ${libdir}/php/PEAR \ + ${libdir}/php/PEAR.php \ + ${libdir}/php/System.php ${libdir}php/peclcmd.php ${libdir}/php/pearcmd.php \ + ${libdir}/php/.channels ${libdir}/php/.channels/.alias \ + ${libdir}/php/.channels\__uri.reg \ + ${libdir}/php/.channels\pear.php.net.reg ${libdir}/php/.channels/pecl.php.net.reg \ + ${libdir}/php/.registry \ + ${libdir}/php/Archive/Tar.php \ + ${libdir}/php/Console/Getopt.php ${libdir}/php/OS/Guess.php \ + ${sysconfdir}/pear.conf" + + +FILES_${PN}-dev = "${includedir}/php ${libdir}/build \ + ${bindir}/phpize ${bindir}/php-config \ + ${libdir}/php/.depdb ${libdir}/php/.depdblock ${libdir}/php/.filemap ${libdir}/php/.lock \ + ${libdir}/php/test " + +FILES_${PN} = "${libdir}/php" +FILES_${PN} += "${bindir}" + +RDEPENDS_${PN}-pear = ${PN} +RDEPENDS_${PN}-cli = ${PN} +RDEPENDS_${PN}-dev = ${PN} -- cgit v1.2.3