X-Git-Url: https://git.tld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=spl-shared.patch;h=a928d0cad36a22d788a1661cc49e6d03f1aa2693;hp=9aea6c46db7b46f854c1872da857ee25a7af6446;hb=d65fa9e5c624d712964e98251295575d49b84ee1;hpb=dccfdb642699a3ed67e7237de27992afdee1f86d

diff --git a/spl-shared.patch b/spl-shared.patch
index 9aea6c4..a928d0c 100644
--- a/spl-shared.patch
+++ b/spl-shared.patch
@@ -8,71 +8,18 @@
 +  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,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
    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])
    PHP_ADD_EXTENSION_DEP(spl, pcre, true)
---- php-5.3.1/ext/spl/spl_iterators.c~	2009-07-04 20:31:27.000000000 +0000
-+++ php-5.3.1/ext/spl/spl_iterators.c	2009-11-27 16:35:33.729087793 +0000
-@@ -58,7 +58,13 @@
- PHPAPI zend_class_entry *spl_ce_AppendIterator;
- PHPAPI zend_class_entry *spl_ce_RegexIterator;
- PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
-+#if COMPILE_DL_SPL
-+#undef spl_ce_Countable
-+zend_class_entry *spl_ce_Countable; // real instance
-+extern PHPAPI zend_class_entry *spl_ce_Countable_p; // external one
-+#else
- PHPAPI zend_class_entry *spl_ce_Countable;
-+#endif
- PHPAPI zend_class_entry *spl_ce_RecursiveTreeIterator;
- 
- ZEND_BEGIN_ARG_INFO(arginfo_recursive_it_void, 0)
-@@ -3286,6 +3292,10 @@
- 	REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator);
- 	REGISTER_SPL_ITERATOR(EmptyIterator);
- 
-+#if COMPILE_DL_SPL
-+	spl_ce_Countable_p = spl_ce_Countable;
-+#endif
-+
- 	REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator, RecursiveIteratorIterator, spl_RecursiveTreeIterator_new, spl_funcs_RecursiveTreeIterator);
- 	REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_CURRENT",      RTIT_BYPASS_CURRENT);
- 	REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_KEY",          RTIT_BYPASS_KEY);
---- php-5.4.0alpha3/ext/spl/spl_iterators.h~	2011-07-27 11:48:08.000000000 +0300
-+++ php-5.4.0alpha3/ext/spl/spl_iterators.h	2011-08-08 00:12:10.892993117 +0300
-@@ -51,7 +51,12 @@
- extern PHPAPI zend_class_entry *spl_ce_AppendIterator;
- extern PHPAPI zend_class_entry *spl_ce_RegexIterator;
- extern PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
-+#if COMPILE_DL_SPL
-+#define spl_ce_Countable spl_ce_Countable_p
-+extern PHPAPI zend_class_entry *spl_ce_Countable_p;
-+#else
- extern PHPAPI zend_class_entry *spl_ce_Countable;
-+#endif
- extern PHPAPI zend_class_entry *spl_ce_CallbackFilterIterator;
- extern PHPAPI zend_class_entry *spl_ce_RecursiveCallbackFilterIterator;
- 
---- php-5.3.1/ext/standard/array.c~	2009-08-14 06:20:21.000000000 +0000
-+++ php-5.3.1/ext/standard/array.c	2009-11-27 16:37:15.029078323 +0000
-@@ -49,6 +49,9 @@
- #ifdef HAVE_SPL
- #include "ext/spl/spl_array.h"
- #endif
-+#if COMPILE_DL_SPL
-+PHPAPI zend_class_entry *spl_ce_Countable_p = NULL; // external one
-+#endif
+--- php-7.1.0alpha1/ext/pdo/pdo.c~	2016-06-07 23:56:47.000000000 +0300
++++ php-7.1.0alpha1/ext/pdo/pdo.c	2016-06-13 23:24:51.238259131 +0300
+@@ -117,7 +117,9 @@
  
- /* {{{ defines */
- #define EXTR_OVERWRITE			0
---- php-5.3.1/ext/pdo/pdo.c~	2009-07-19 22:46:03.000000000 +0000
-+++ php-5.3.1/ext/pdo/pdo.c	2009-11-27 16:37:51.332409104 +0000
-@@ -132,7 +132,7 @@
  /* {{{ pdo_functions[] */
- #if ZEND_MODULE_API_NO >= 20050922
  static const zend_module_dep pdo_deps[] = {
--#ifdef HAVE_SPL
 +#ifdef HAVE_SPL && !COMPILE_DL_SPL
  	ZEND_MOD_REQUIRED("spl")
- #endif
- 	{NULL, NULL, NULL}
++#endif
+ 	ZEND_MOD_END
+ };
+ /* }}} */
 --- php-5.3.1/ext/phar/Makefile.frag~	2009-07-23 15:48:04.000000000 +0000
 +++ php-5.3.1/ext/phar/Makefile.frag	2009-11-30 16:10:29.687175948 +0000
 @@ -10,7 +10,7 @@
@@ -80,7 +27,7 @@
  		if test "x$(PHP_MODULES)" != "x"; then \
  		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
 -		for i in bz2 zlib phar; do \
-+		for i in pcre spl bz2 zlib phar; do \
++		for i in spl bz2 zlib phar; do \
  			if test -f "$(top_builddir)/modules/$$i.la"; then \
  				. $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
  			fi; \