summarylogtreecommitdiffstats
path: root/recode-php5.4.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recode-php5.4.patch')
-rw-r--r--recode-php5.4.patch23
1 files changed, 0 insertions, 23 deletions
diff --git a/recode-php5.4.patch b/recode-php5.4.patch
deleted file mode 100644
index 10a5d83e2e52..000000000000
--- a/recode-php5.4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/ext/recode/config9.m4
-+++ b/ext/recode/config9.m4
-@@ -13,6 +13,6 @@
- fi
-
- if test -n "$recode_conflict"; then
-- AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict])
-+ AC_MSG_WARN([recode extension can not be configured together with:$recode_conflict])
- fi
- fi
---- php-5.6.40/configure
-+++ php-5.6.40/configure
-@@ -104651,10 +104651,6 @@
- fi
-
- fi
--
-- if test -n "$recode_conflict"; then
-- as_fn_error $? "recode extension can not be configured together with:$recode_conflict" "$LINENO" 5
-- fi
- fi
-
-