]> git.pld-linux.org Git - packages/php.git/commitdiff
drop php-filter-shared.patch; no longer needed
authorElan Ruusamäe <glen@pld-linux.org>
Sat, 11 May 2019 07:55:28 +0000 (10:55 +0300)
committerElan Ruusamäe <glen@pld-linux.org>
Sat, 11 May 2019 08:03:30 +0000 (11:03 +0300)
commit 26f98ecd19bac2d8911fe85d4b086b4ff5408e8c
Author: Kalle Sommer Nielsen <kalle@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 [deleted file]
php.spec

diff --git a/php-filter-shared.patch b/php-filter-shared.patch
deleted file mode 100644 (file)
index 3983c3f..0000000
+++ /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
index a4153053fe54140fc690dd93a15cf4fbdd0fe577..c16b08f6b62c36e203b14cd1cf2ac497b70752f5 100644 (file)
--- 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}
This page took 0.067241 seconds and 4 git commands to generate.