diff options
| -rw-r--r-- | packages/php/php-5.2.5/acinclude-xml2-config.patch | 18 | ||||
| -rw-r--r-- | packages/php/php-5.2.5/pear-makefile.patch | 11 | ||||
| -rw-r--r-- | packages/php/php-5.2.6/.mtn2git_empty (renamed from packages/php/php-5.2.5/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/php/php_5.2.6.bb (renamed from packages/php/php_5.2.5.bb) | 4 |
4 files changed, 2 insertions, 31 deletions
diff --git a/packages/php/php-5.2.5/acinclude-xml2-config.patch b/packages/php/php-5.2.5/acinclude-xml2-config.patch deleted file mode 100644 index bf519d2934..0000000000 --- a/packages/php/php-5.2.5/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/packages/php/php-5.2.5/pear-makefile.patch b/packages/php/php-5.2.5/pear-makefile.patch deleted file mode 100644 index 26de98a48f..0000000000 --- a/packages/php/php-5.2.5/pear-makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200 -+++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200 -@@ -6,7 +6,7 @@ - PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0 - - install-pear-installer: $(SAPI_CLI_PATH) -- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" -+ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" - - install-pear: - @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/packages/php/php-5.2.5/.mtn2git_empty b/packages/php/php-5.2.6/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/php/php-5.2.5/.mtn2git_empty +++ b/packages/php/php-5.2.6/.mtn2git_empty diff --git a/packages/php/php_5.2.5.bb b/packages/php/php_5.2.6.bb index a8dc83a444..6281cfe04e 100644 --- a/packages/php/php_5.2.5.bb +++ b/packages/php/php_5.2.6.bb @@ -1,6 +1,6 @@ require php.inc -PR = "r3" +PR = "r1" SRC_URI += "file://pear-makefile.patch;patch=1 " @@ -14,7 +14,7 @@ EXTRA_OECONF = " --without-iconv \ --enable-wddx \ --enable-embedded-mysqli \ --enable-magic-quotes \ - --with-zlib \ + --with-zlib \ --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \ --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \ " |