[packages/php.git] / spl-shared.patch

--- php-7.0/ext/spl/config.m4~	2015-05-21 17:57:06.000000000 +0300
+++ php-7.0/ext/spl/config.m4	2015-05-23 11:25:19.609715006 +0300
@@ -22,6 +22,6 @@
   CPPFLAGS=$old_CPPFLAGS
   AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed])
   AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) 
-  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,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+  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-7.1.0alpha2/ext/standard/array.c~	2016-07-04 17:52:16.000000000 +0300
+++ php-7.1.0alpha2/ext/standard/array.c	2016-07-04 18:54:43.937173429 +0300
@@ -48,6 +48,10 @@
 #include "zend_smart_str.h"
 #include "ext/spl/spl_array.h"
 
+#if COMPILE_DL_SPL
+PHPAPI zend_class_entry *spl_ce_Countable_p = NULL; // external one
+#endif
+
 /* {{{ defines */
 #define EXTR_OVERWRITE			0
 #define EXTR_SKIP				1
--- 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 @@
 
 /* {{{ pdo_functions[] */
 static const zend_module_dep pdo_deps[] = {
+#ifdef HAVE_SPL && !COMPILE_DL_SPL
 	ZEND_MOD_REQUIRED("spl")
+#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 @@
 		$(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
 		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 \
 			if test -f "$(top_builddir)/modules/$$i.la"; then \
 				. $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
 			fi; \
Commit	Line	Data
f4ee12ea ER	1	--- php-7.0/ext/spl/config.m4~ 2015-05-21 17:57:06.000000000 +0300
f4ee12ea ER	2	+++ php-7.0/ext/spl/config.m4 2015-05-23 11:25:19.609715006 +0300
c0240cb1	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])
f4ee12ea ER	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,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
f4ee12ea ER	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,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
c0240cb1	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);
9eb543e2 ER	38	--- php-5.4.0alpha3/ext/spl/spl_iterators.h~ 2011-07-27 11:48:08.000000000 +0300
9eb543e2 ER	39	+++ php-5.4.0alpha3/ext/spl/spl_iterators.h 2011-08-08 00:12:10.892993117 +0300
c0240cb1	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
9eb543e2 ER	50	extern PHPAPI zend_class_entry *spl_ce_CallbackFilterIterator;
9eb543e2 ER	51	extern PHPAPI zend_class_entry *spl_ce_RecursiveCallbackFilterIterator;
c0240cb1	52
a44eaa98 ER	53	--- php-7.1.0alpha2/ext/standard/array.c~ 2016-07-04 17:52:16.000000000 +0300
	54	+++ php-7.1.0alpha2/ext/standard/array.c 2016-07-04 18:54:43.937173429 +0300
	55	@@ -48,6 +48,10 @@
	56	#include "zend_smart_str.h"
c0240cb1	57	#include "ext/spl/spl_array.h"
a44eaa98	58
c0240cb1	59	+#if COMPILE_DL_SPL
	60	+PHPAPI zend_class_entry *spl_ce_Countable_p = NULL; // external one
	61	+#endif
a44eaa98	62	+
c0240cb1	63	/* {{{ defines */
c0240cb1	64	#define EXTR_OVERWRITE 0
a44eaa98	65	#define EXTR_SKIP 1
14cf8d28 ER	66	--- php-7.1.0alpha1/ext/pdo/pdo.c~ 2016-06-07 23:56:47.000000000 +0300
	67	+++ php-7.1.0alpha1/ext/pdo/pdo.c 2016-06-13 23:24:51.238259131 +0300
	68	@@ -117,7 +117,9 @@
	69
c0240cb1	70	/* {{{ pdo_functions[] */
c0240cb1	71	static const zend_module_dep pdo_deps[] = {
c0240cb1	72	+#ifdef HAVE_SPL && !COMPILE_DL_SPL
c0240cb1	73	ZEND_MOD_REQUIRED("spl")
14cf8d28 ER	74	+#endif
	75	ZEND_MOD_END
	76	};
	77	/* }}} */
c0240cb1	78	--- php-5.3.1/ext/phar/Makefile.frag~ 2009-07-23 15:48:04.000000000 +0000
	79	+++ php-5.3.1/ext/phar/Makefile.frag 2009-11-30 16:10:29.687175948 +0000
	80	@@ -10,7 +10,7 @@
	81	$(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
	82	if test "x$(PHP_MODULES)" != "x"; then \
	83	$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
	84	- for i in bz2 zlib phar; do \
	85	+ for i in pcre spl bz2 zlib phar; do \
	86	if test -f "$(top_builddir)/modules/$$i.la"; then \
	87	. $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
	88	fi; \