diff options
| author | Shane Volpe <shanevolpe@gmail.com> | 2008-08-20 03:17:14 +0000 |
|---|---|---|
| committer | Shane Volpe <shanevolpe@gmail.com> | 2008-08-20 03:17:14 +0000 |
| commit | ded4587ed4991a79c1e5d433bf4d5c5b3bdf65f8 (patch) | |
| tree | d7bb0235130f98319044558ddff7eff4a512aceb | |
| parent | e42584299a8db7c9aae185d543a123ecf511ecba (diff) | |
| parent | 8e36fb286658ad83b87c20583c20334321f6b7ac (diff) | |
merge of '45717dd378e89bf7ba418cac08db57a5e7a55474'
and '89b3663402c864c49ce19e33bca2ae6a059b54f9'
| -rw-r--r-- | packages/php/php-5.2.6/acinclude-xml2-config.patch | 18 | ||||
| -rw-r--r-- | packages/php/php-5.2.6/pear-makefile.patch | 11 |
2 files changed, 29 insertions, 0 deletions
diff --git a/packages/php/php-5.2.6/acinclude-xml2-config.patch b/packages/php/php-5.2.6/acinclude-xml2-config.patch new file mode 100644 index 0000000000..bf519d2934 --- /dev/null +++ b/packages/php/php-5.2.6/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/packages/php/php-5.2.6/pear-makefile.patch b/packages/php/php-5.2.6/pear-makefile.patch new file mode 100644 index 0000000000..26de98a48f --- /dev/null +++ b/packages/php/php-5.2.6/pear-makefile.patch @@ -0,0 +1,11 @@ +--- /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)/" |