diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-06-05 23:42:52 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-06-05 23:42:52 +0000 |
| commit | 96455275ddb5a2feed979afd277419d108c836b1 (patch) | |
| tree | fe5eaed7fad8d19c8a588cc375ce3b52fbb96df4 /user/php7/allow-build-recode-and-imap-together.patch | |
| parent | 6021da9d6a1217b3d891e48a424732f3f7fcd46c (diff) | |
| parent | 8be79780a4d67231c74bfe1f57648a16aea85687 (diff) | |
| download | packages-96455275ddb5a2feed979afd277419d108c836b1.tar.gz packages-96455275ddb5a2feed979afd277419d108c836b1.tar.bz2 packages-96455275ddb5a2feed979afd277419d108c836b1.tar.xz packages-96455275ddb5a2feed979afd277419d108c836b1.zip | |
Merge branch 'php7' into 'master'
user/{libzip,php7}: new packages
See merge request !38
Diffstat (limited to 'user/php7/allow-build-recode-and-imap-together.patch')
| -rw-r--r-- | user/php7/allow-build-recode-and-imap-together.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/user/php7/allow-build-recode-and-imap-together.patch b/user/php7/allow-build-recode-and-imap-together.patch new file mode 100644 index 000000000..555092f45 --- /dev/null +++ b/user/php7/allow-build-recode-and-imap-together.patch @@ -0,0 +1,20 @@ +Extensions recode and imap can't be loaded together, but they can be build +together, and that's what we want. + +Source: https://src.fedoraproject.org/cgit/rpms/php.git/tree/php-5.3.0-recode.patch?h=f26 +--- a/ext/recode/config9.m4 ++++ b/ext/recode/config9.m4 +@@ -4,13 +4,6 @@ dnl + + dnl Check for extensions with which Recode can not work + if test "$PHP_RECODE" != "no"; then +- test "$PHP_IMAP" != "no" && recode_conflict="$recode_conflict imap" +- +- if test -n "$MYSQL_LIBNAME"; then +- PHP_CHECK_LIBRARY($MYSQL_LIBNAME, hash_insert, [ +- recode_conflict="$recode_conflict mysql" +- ]) +- fi + + if test -n "$recode_conflict"; then + AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict]) |