]> TLD Linux GIT Repositories - packages/php.git/blob - spl-shared.patch
- updated to 7.2.1, partial PLD merge
[packages/php.git] / spl-shared.patch
1 --- php-7.0/ext/spl/config.m4~  2015-05-21 17:57:06.000000000 +0300
2 +++ php-7.0/ext/spl/config.m4   2015-05-23 11:25:19.609715006 +0300
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,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
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)
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-7.1.0alpha1/ext/pdo/pdo.c~      2016-06-07 23:56:47.000000000 +0300
12 +++ php-7.1.0alpha1/ext/pdo/pdo.c       2016-06-13 23:24:51.238259131 +0300
13 @@ -117,7 +117,9 @@
14  
15  /* {{{ pdo_functions[] */
16  static const zend_module_dep pdo_deps[] = {
17 +#ifdef HAVE_SPL && !COMPILE_DL_SPL
18         ZEND_MOD_REQUIRED("spl")
19 +#endif
20         ZEND_MOD_END
21  };
22  /* }}} */
23 --- php-5.3.1/ext/phar/Makefile.frag~   2009-07-23 15:48:04.000000000 +0000
24 +++ php-5.3.1/ext/phar/Makefile.frag    2009-11-30 16:10:29.687175948 +0000
25 @@ -10,7 +10,7 @@
26                 $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
27                 if test "x$(PHP_MODULES)" != "x"; then \
28                 $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
29 -               for i in bz2 zlib phar; do \
30 +               for i in spl bz2 zlib phar; do \
31                         if test -f "$(top_builddir)/modules/$$i.la"; then \
32                                 . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
33                         fi; \