[packages/php/dev-7.4] spl extension can not be disabled; build statically
glen
glen at pld-linux.org
Thu Jun 20 01:16:42 CEST 2019
commit e4bf8bedf0cc1e868b1e6e234547b730ab3fcc53
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Wed Jun 19 23:11:50 2019 +0300
spl extension can not be disabled; build statically
php.spec | 38 ++++++--------------------------------
spl-shared.patch | 30 ------------------------------
2 files changed, 6 insertions(+), 62 deletions(-)
---
diff --git a/php.spec b/php.spec
index e666677..fb6a44d 100644
--- a/php.spec
+++ b/php.spec
@@ -1,7 +1,5 @@
# NOTES
# - mysqlnd driver doesn't support reconnect: https://bugs.php.net/bug.php?id=52561
-# TODO 7.4:
-# - follow upstream: drop spl, subpackages (tired of maintaining them)
# TODO 5.6:
# - enable --with-fpm-systemd, but ensure it checks for sd_booted()
# TODO 5.4:
@@ -218,7 +216,6 @@ Patch44: %{orgname}-include_path.patch
Patch45: %{orgname}-imap-annotations.patch
Patch46: %{orgname}-imap-myrights.patch
Patch50: extension-shared-optional-dep.patch
-Patch51: spl-shared.patch
Patch53: fix-test-run.patch
Patch55: bug-52078-fileinode.patch
Patch59: %{orgname}-systzdata.patch
@@ -569,6 +566,7 @@ Requires: php-dirs >= 1.4
Requires: rpm-whiteout >= 1.28
Requires: tzdata
Requires: zlib >= 1.2.0.4
+Requires: %{name}-simplexml = %{epoch}:%{version}-%{release}
Provides: %{name}(debug) = %{php_debug}
Provides: %{name}(modules_api) = %{php_api_version}
Provides: %{name}(thread-safety) = %{_zend_zts}
@@ -578,6 +576,7 @@ Provides: %{name}-core
Provides: %{name}-date
Provides: %{name}-hash = %{epoch}:%{version}-%{release}
Provides: %{name}-pcre = %{epoch}:%{version}-%{release}
+Provides: %{name}-spl = %{epoch}:%{version}-%{release}
Provides: %{name}-reflection
Provides: %{name}-standard
Provides: php(core) = %{version}
@@ -586,6 +585,7 @@ Provides: php(hash) = %{hashver}
Provides: php(libxml)
Provides: php(pcre)
Provides: php(reflection)
+Provides: php(spl)
Provides: php(standard)
%{!?with_mysqlnd:Obsoletes: %{name}-mysqlnd}
%requires_ge_to pcre2-8 pcre2-8-devel
@@ -597,12 +597,13 @@ Obsoletes: php-hwapi < 4:5.2.0
Obsoletes: php-hyperwave < 3:5.0.0
Obsoletes: php-java < 3:5.0.0
Obsoletes: php-mcal < 3:5.0.0
+Obsoletes: php-pcre < 4:5.3.28-7
Obsoletes: php-pecl-domxml
Obsoletes: php-pecl-hash < %{hashver}
Obsoletes: php-qtdom < 3:5.0.0
+Obsoletes: php-spl < 4:5.3.28-7
Conflicts: php4-common < 3:4.4.4-8
Conflicts: php55-common < 4:5.5.10-4
-Obsoletes: php-pcre < 4:5.3.28-7
Conflicts: rpm < 4.4.2-0.2
%if %{with mhash}
Provides: php(mhash)
@@ -1637,24 +1638,6 @@ Provides: php(sodium) = %{sodiumver}
%description sodium
A simple, low-level PHP extension for libsodium.
-%package spl
-Summary: Standard PHP Library module for PHP
-Summary(pl.UTF-8): Moduł biblioteki standardowej (Standard PHP Library) dla PHP
-Group: Libraries
-URL: http://php.net/manual/en/book.spl.php
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: %{name}-pcre = %{epoch}:%{version}-%{release}
-Requires: %{name}-simplexml = %{epoch}:%{version}-%{release}
-Provides: php(spl)
-Obsoletes: php-spl < 4:5.3.28-7
-
-%description spl
-This is a dynamic shared object (DSO) for PHP that will add Standard
-PHP Library support.
-
-%description spl -l pl.UTF-8
-Moduł PHP z biblioteką standardową PHP (SPL - Standard PHP Library).
-
%package sqlite3
Summary: SQLite3 extension module for PHP
Summary(pl.UTF-8): Moduł SQLite3 dla PHP
@@ -1948,7 +1931,7 @@ cp -p php.ini-production php.ini
#%patch45 -p1 # imap annotations. fixme
#%patch46 -p1 # imap myrights. fixme
%patch50 -p1
-%patch51 -p1 -b .spl-shared
+
%patch53 -p1
%undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
%patch55 -p1
@@ -2425,8 +2408,6 @@ generate_inifiles() {
# opcache.so is zend extension
nm $so | grep -q zend_extension_entry && ext=zend_extension
conf="$mod.ini"
- # spl needs to be loaded before mysqli
- [ "$mod" = "spl" ] && conf="SPL.ini"
# session needs to be loaded before php-pecl-http, php-pecl-memcache, php-pecl-session_mysql
[ "$mod" = "session" ] && conf="Session.ini"
# mysqlnd needs to be loaded before mysqli,pdo_mysqli
@@ -2821,7 +2802,6 @@ fi \
%extension_scripts soap
%extension_scripts sockets
%extension_scripts sodium
-%extension_scripts spl
%extension_scripts sqlite3
%extension_scripts sysvmsg
%extension_scripts sysvsem
@@ -3342,12 +3322,6 @@ fi
%attr(755,root,root) %{php_extensiondir}/sodium.so
%endif
-%files spl
-%defattr(644,root,root,755)
-%doc ext/spl/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/SPL.ini
-%attr(755,root,root) %{php_extensiondir}/spl.so
-
%if %{with sqlite3}
%files sqlite3
%defattr(644,root,root,755)
diff --git a/spl-shared.patch b/spl-shared.patch
deleted file mode 100644
index 72229e7..0000000
--- a/spl-shared.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- php-src-PHP-7.4/ext/spl/config.m4~ 2019-05-25 12:37:30.000000000 +0300
-+++ php-src-PHP-7.4/ext/spl/config.m4 2019-05-26 10:12:09.893194716 +0300
-@@ -1,3 +1,3 @@
--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-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 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; \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/dc749f05f4e6b8ecc255d77e12a1599af9aea8a7
More information about the pld-cvs-commit
mailing list