org.handhelds.familiar/packages/php/files/pear.patch

   1
   2 #
   3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
   4 #
   5
   6 --- php-4.3.6/configure.in~pear.patch   2004-06-04 19:03:26.595419000 -0400
   7 +++ php-4.3.6/configure.in      2004-06-04 19:10:32.984552663 -0400
   8 @@ -850,15 +850,38 @@
   9  [  --with-pear=DIR         Install PEAR in DIR (default PREFIX/lib/php)
  10    --without-pear          Do not install PEAR], DEFAULT, yes)
  11
  12 +AC_ARG_WITH([pear-php-cli],
  13 +[  --with-pear-php-cli=CLI ],
  14 +[
  15 +  PEAR_PHP_CLI="$withval"
  16 +],[
  17 +  PEAR_PHP_CLI=""
  18 +])
  19 +
  20  if test "$PHP_PEAR" != "no"; then
  21
  22    dnl
  23    dnl PEAR dependancies
  24    dnl
  25 -  if test "$PHP_SAPI_CLI" = "no"; then
  26 -    pear_error_msg="$pear_error_msg
  27 -                    PEAR requires CLI to be enabled.     Add --enable-cli to the configure line. (or --disable-pear)"
  28 +
  29 +  dnl PEAR requires a native PHP CLI.
  30 +  if test "x$PEAR_PHP_CLI" == "x"; then
  31 +    if test "x$cross_compiling" = "xyes"; then
  32 +      pear_error_msg="$pear_error_msg
  33 +                      PEAR requires a native architecture PHP CLI when crosscompiling.
  34 +                      Add --with-pear-php-cli=PATH to the configure line. (or --disable-pear)"
  35 +    else
  36 +      if test "x$PHP_SAPI_CLI" != "xno"; then
  37 +        PEAR_PHP_CLI="$PHP_SAPI_CLI"
  38 +      else
  39 +        pear_error_msg="$pear_error_msg
  40 +                        PEAR requires CLI to be enabled.     Add --enable-cli to the configure line. (or --disable-pear)"
  41 +      fi
  42 +    fi
  43    fi
  44 +
  45 +  AC_SUBST([PEAR_PHP_CLI])
  46 +
  47    if test "$PHP_PCRE_REGEX" = "no"; then
  48      pear_error_msg="$pear_error_msg
  49                      PEAR requires PCRE to be enabled.    Add --with-pcre-regex to the configure line. (or --disable-pear)"
  50 @@ -1233,6 +1256,7 @@
  51  PHP_ADD_BUILD_DIR(Zend)
  52
  53  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/scripts/Makefile.frag,$abs_srcdir/scripts,scripts)
  54 +AC_OUTPUT([pear/Makefile.frag])
  55  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
  56  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend)
  57
  58 --- /dev/null   2004-02-23 16:04:30.000000000 -0500
  59 +++ php-4.3.6/pear/Makefile.frag.in     2004-06-04 19:10:53.643569437 -0400
  60 @@ -0,0 +1,23 @@
  61 +# -*- makefile -*-
  62 +
  63 +peardir=$(PEAR_INSTALLDIR)
  64 +
  65 +# Skip all php.ini files altogether
  66 +PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0
  67 +PEAR_PHP_CLI = @PEAR_PHP_CLI@
  68 +
  69 +install-pear-installer: $(PEAR_PHP_CLI)
  70 +       @$(PEAR_PHP_CLI) $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" $(srcdir)/package-*.xml
  71 +
  72 +install-pear-packages: $(PEAR_PHP_CLI)
  73 +       @$(PEAR_PHP_CLI) $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" $(srcdir)/packages/*.tar
  74 +
  75 +install-pear:
  76 +       @echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
  77 +       @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
  78 +               $(MAKE) -s install-pear-installer install-pear-packages; \
  79 +       else \
  80 +               cat $(srcdir)/install-pear.txt; \
  81 +               exit 5; \
  82 +       fi
  83 +