php7: restructure patches
[feed/packages.git] / lang / php7 / patches / 0014-force_libmysqlclient_r.patch
1 From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
2 Date: Sat, 2 May 2015 10:26:53 +0200
3 Subject: force_libmysqlclient_r
4
5 ---
6 ext/mysqli/config.m4 | 2 +-
7 ext/pdo_mysql/config.m4 | 2 +-
8 2 files changed, 2 insertions(+), 2 deletions(-)
9
10 diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
11 index c700dac..8932005 100644
12 --- a/ext/mysqli/config.m4
13 +++ b/ext/mysqli/config.m4
14 @@ -59,7 +59,7 @@ elif test "$PHP_MYSQLI" != "no"; then
15 MYSQL_LIB_CFG='--libmysqld-libs'
16 dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
17 mysqli_extra_sources="mysqli_embedded.c"
18 - elif test "$enable_maintainer_zts" = "yes"; then
19 + elif true || test "$enable_maintainer_zts" = "yes"; then
20 MYSQL_LIB_CFG='--libs_r'
21 MYSQL_LIB_NAME='mysqlclient_r'
22 else
23 diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
24 index c165fb6..2e391eb 100755
25 --- a/ext/pdo_mysql/config.m4
26 +++ b/ext/pdo_mysql/config.m4
27 @@ -67,7 +67,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
28 if test "x$SED" = "x"; then
29 AC_PATH_PROG(SED, sed)
30 fi
31 - if test "$enable_maintainer_zts" = "yes"; then
32 + if true || test "$enable_maintainer_zts" = "yes"; then
33 PDO_MYSQL_LIBNAME=mysqlclient_r
34 PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
35 else