diff options
| author | Graeme Gregory <gg@slimlogic.co.uk> | 2009-12-09 17:09:52 -0700 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-12-10 00:12:59 +0000 |
| commit | cbca434e98e6a29f3676f109601b033aa8412aa9 (patch) | |
| tree | 6ae65e178229187aad922170d0fd2129c5647a52 /recipes/php/php-5.2.11 | |
| parent | ef7b6b4d61dd6dd16e26dd8f77712c9c6816c718 (diff) | |
php_5.2.11.bb : add latest version of php 5.2 series.
Re-enabled pcntl as it seems to be compiling, removed string.c patch
as that seemed to be no longer required and rehashed other patches for
the new version.
Diffstat (limited to 'recipes/php/php-5.2.11')
| -rw-r--r-- | recipes/php/php-5.2.11/acinclude-xml2-config.patch | 18 | ||||
| -rw-r--r-- | recipes/php/php-5.2.11/pear-makefile.patch | 13 |
2 files changed, 31 insertions, 0 deletions
diff --git a/recipes/php/php-5.2.11/acinclude-xml2-config.patch b/recipes/php/php-5.2.11/acinclude-xml2-config.patch new file mode 100644 index 0000000000..bf519d2934 --- /dev/null +++ b/recipes/php/php-5.2.11/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.11/pear-makefile.patch b/recipes/php/php-5.2.11/pear-makefile.patch new file mode 100644 index 0000000000..487f507a02 --- /dev/null +++ b/recipes/php/php-5.2.11/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)/" |