spl-shared.patch

   1 --- php-5.3.1/ext/spl/config.m4~        2009-11-26 23:54:34.000000000 +0000
   2 +++ php-5.3.1/ext/spl/config.m4 2009-11-27 08:04:05.788823797 +0000
   3 @@ -22,6 +22,6 @@
   4    CPPFLAGS=$old_CPPFLAGS
   5    AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed])
   6    AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support])
   7 -  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no)
   8 +  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, $ext_shared)
   9    PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h])
  10    PHP_ADD_EXTENSION_DEP(spl, pcre, true)
  11 --- php-5.3.1/ext/spl/spl_iterators.c~  2009-07-04 20:31:27.000000000 +0000
  12 +++ php-5.3.1/ext/spl/spl_iterators.c   2009-11-27 16:35:33.729087793 +0000
  13 @@ -58,7 +58,13 @@
  14  PHPAPI zend_class_entry *spl_ce_AppendIterator;
  15  PHPAPI zend_class_entry *spl_ce_RegexIterator;
  16  PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
  17 +#if COMPILE_DL_SPL
  18 +#undef spl_ce_Countable
  19 +zend_class_entry *spl_ce_Countable; // real instance
  20 +extern PHPAPI zend_class_entry *spl_ce_Countable_p; // external one
  21 +#else
  22  PHPAPI zend_class_entry *spl_ce_Countable;
  23 +#endif
  24  PHPAPI zend_class_entry *spl_ce_RecursiveTreeIterator;
  25
  26  ZEND_BEGIN_ARG_INFO(arginfo_recursive_it_void, 0)
  27 @@ -3286,6 +3292,10 @@
  28         REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator);
  29         REGISTER_SPL_ITERATOR(EmptyIterator);
  30
  31 +#if COMPILE_DL_SPL
  32 +       spl_ce_Countable_p = spl_ce_Countable;
  33 +#endif
  34 +
  35         REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator, RecursiveIteratorIterator, spl_RecursiveTreeIterator_new, spl_funcs_RecursiveTreeIterator);
  36         REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_CURRENT",      RTIT_BYPASS_CURRENT);
  37         REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_KEY",          RTIT_BYPASS_KEY);
  38 --- php-5.3.1/ext/spl/spl_iterators.h~  2008-12-31 11:15:49.000000000 +0000
  39 +++ php-5.3.1/ext/spl/spl_iterators.h   2009-11-27 16:36:35.215748808 +0000
  40 @@ -51,7 +51,12 @@
  41  extern PHPAPI zend_class_entry *spl_ce_AppendIterator;
  42  extern PHPAPI zend_class_entry *spl_ce_RegexIterator;
  43  extern PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
  44 +#if COMPILE_DL_SPL
  45 +#define spl_ce_Countable spl_ce_Countable_p
  46 +extern PHPAPI zend_class_entry *spl_ce_Countable_p;
  47 +#else
  48  extern PHPAPI zend_class_entry *spl_ce_Countable;
  49 +#endif
  50
  51  PHP_MINIT_FUNCTION(spl_iterators);
  52
  53 --- php-5.3.1/ext/standard/array.c~     2009-08-14 06:20:21.000000000 +0000
  54 +++ php-5.3.1/ext/standard/array.c      2009-11-27 16:37:15.029078323 +0000
  55 @@ -49,6 +49,9 @@
  56  #ifdef HAVE_SPL
  57  #include "ext/spl/spl_array.h"
  58  #endif
  59 +#if COMPILE_DL_SPL
  60 +PHPAPI zend_class_entry *spl_ce_Countable_p = NULL; // external one
  61 +#endif
  62
  63  /* {{{ defines */
  64  #define EXTR_OVERWRITE                 0
  65 --- php-5.3.1/ext/pdo/pdo.c~    2009-07-19 22:46:03.000000000 +0000
  66 +++ php-5.3.1/ext/pdo/pdo.c     2009-11-27 16:37:51.332409104 +0000
  67 @@ -132,7 +132,7 @@
  68  /* {{{ pdo_functions[] */
  69  #if ZEND_MODULE_API_NO >= 20050922
  70  static const zend_module_dep pdo_deps[] = {
  71 -#ifdef HAVE_SPL
  72 +#ifdef HAVE_SPL && !COMPILE_DL_SPL
  73         ZEND_MOD_REQUIRED("spl")
  74  #endif
  75         {NULL, NULL, NULL}
  76 --- php-5.3.1/ext/phar/Makefile.frag~   2009-07-23 15:48:04.000000000 +0000
  77 +++ php-5.3.1/ext/phar/Makefile.frag    2009-11-30 16:10:29.687175948 +0000
  78 @@ -10,7 +10,7 @@
  79                 $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
  80                 if test "x$(PHP_MODULES)" != "x"; then \
  81                 $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
  82 -               for i in bz2 zlib phar; do \
  83 +               for i in pcre spl bz2 zlib phar; do \
  84                         if test -f "$(top_builddir)/modules/$$i.la"; then \
  85                                 . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
  86                         fi; \