[packages/php/dev-7.4: 3/4] drop php-filter-shared.patch; no longer needed
glen
glen at pld-linux.org
Sat May 11 10:40:01 CEST 2019
commit 632addbb11a3feaeb8ebddf7979e8af6a99c5430
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Sat May 11 10:55:28 2019 +0300
drop php-filter-shared.patch; no longer needed
commit 26f98ecd19bac2d8911fe85d4b086b4ff5408e8c
Author: Kalle Sommer Nielsen <kalle at php.net>
Date: Wed Mar 20 20:09:45 2019 +0200
Sync the changes to ext/filter with 7.4, now that it works.
- Removed --with-pcre-dir
- The filter extension can now be built as shared on Unix with ./configure
- https://github.com/php/php-src/commit/26f98ecd19bac2d8911fe85d4b086b4ff5408e8c
php-filter-shared.patch | 14 --------------
php.spec | 2 --
2 files changed, 16 deletions(-)
---
diff --git a/php.spec b/php.spec
index a415305..c16b08f 100644
--- a/php.spec
+++ b/php.spec
@@ -186,7 +186,6 @@ Patch1: %{orgname}-pldlogo.patch
Patch2: %{orgname}-mail.patch
Patch3: %{orgname}-link-libs.patch
Patch4: intl-stdc++.patch
-Patch5: %{orgname}-filter-shared.patch
Patch7: %{orgname}-sapi-ini-file.patch
Patch8: milter.patch
@@ -1991,7 +1990,6 @@ cp -p php.ini-production php.ini
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%patch7 -p1
%{?with_milter:%patch8 -p1}
diff --git a/php-filter-shared.patch b/php-filter-shared.patch
deleted file mode 100644
index 3983c3f..0000000
--- a/php-filter-shared.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- php-5.2.0/ext/filter/config.m4~ 2006-01-14 17:04:12.000000000 +0200
-+++ php-5.2.0/ext/filter/config.m4 2006-11-20 00:06:09.272529853 +0200
-@@ -10,10 +10,7 @@
- if test "$PHP_FILTER" != "no"; then
-
- dnl Check if configure is the PHP core configure
-- if test -n "$PHP_VERSION"; then
-- dnl This extension can not be build as shared when in PHP core
-- ext_shared=no
-- else
-+ if test -z "$PHP_VERSION"; then
- dnl This is PECL build, check if bundled PCRE library is used
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=$INCLUDES
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/57c295b48dd70472b658d67292c989f703a920c6
More information about the pld-cvs-commit
mailing list