diff options
| author | Michael Heimpold <mhei@heimpold.de> | 2016-09-04 13:27:32 +0200 |
|---|---|---|
| committer | Michael Heimpold <mhei@heimpold.de> | 2016-09-04 13:40:44 +0200 |
| commit | 86acab6430c10f20c44128320927ba6f9e13b84a (patch) | |
| tree | 3430689a56033617c051a2c2c9a6a5cc76f8c72e /lang/php7 | |
| parent | aa28298a35d7100ea7ff8ccdeb07d779db086adb (diff) | |
php7: mod-mysqli: use libmysqlclient instead of libmysqlclient_r (refs #3132)
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Diffstat (limited to 'lang/php7')
| -rw-r--r-- | lang/php7/Makefile | 6 | ||||
| -rw-r--r-- | lang/php7/patches/0014-force_libmysqlclient_r.patch | 35 |
2 files changed, 3 insertions, 38 deletions
diff --git a/lang/php7/Makefile b/lang/php7/Makefile index cb128e526..82e73fe9d 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=7.0.10 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> @@ -562,12 +562,12 @@ $(eval $(call BuildModule,json,JSON)) $(eval $(call BuildModule,ldap,LDAP,+PACKAGE_php7-mod-ldap:libopenldap +PACKAGE_php7-mod-ldap:libsasl2)) $(eval $(call BuildModule,mbstring,MBString)) $(eval $(call BuildModule,mcrypt,Mcrypt,+PACKAGE_php7-mod-mcrypt:libmcrypt +PACKAGE_php7-mod-mcrypt:libltdl)) -$(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php7-mod-mysqli:libmysqlclient-r)) +$(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php7-mod-mysqli:libmysqlclient)) $(eval $(call BuildModule,opcache,OPcache,,zend)) $(eval $(call BuildModule,openssl,OpenSSL,+PACKAGE_php7-mod-openssl:libopenssl)) $(eval $(call BuildModule,pcntl,PCNTL)) $(eval $(call BuildModule,pdo,PHP Data Objects)) -$(eval $(call BuildModule,pdo-mysql,PDO driver for MySQL,+php7-mod-pdo +PACKAGE_php7-mod-pdo-mysql:libmysqlclient-r)) +$(eval $(call BuildModule,pdo-mysql,PDO driver for MySQL,+php7-mod-pdo +PACKAGE_php7-mod-pdo-mysql:libmysqlclient)) $(eval $(call BuildModule,pdo-pgsql,PDO driver for PostgreSQL,+php7-mod-pdo +PACKAGE_php7-mod-pdo-pgsql:libpq)) $(eval $(call BuildModule,pdo-sqlite,PDO driver for SQLite 3.x,+php7-mod-pdo +PACKAGE_php7-mod-pdo-sqlite:libsqlite3 +PACKAGE_php7-mod-pdo-sqlite:librt)) $(eval $(call BuildModule,pgsql,PostgreSQL,+PACKAGE_php7-mod-pgsql:libpq)) diff --git a/lang/php7/patches/0014-force_libmysqlclient_r.patch b/lang/php7/patches/0014-force_libmysqlclient_r.patch deleted file mode 100644 index 8f15181c3..000000000 --- a/lang/php7/patches/0014-force_libmysqlclient_r.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org> -Date: Sat, 2 May 2015 10:26:53 +0200 -Subject: force_libmysqlclient_r - ---- - ext/mysqli/config.m4 | 2 +- - ext/pdo_mysql/config.m4 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4 -index c700dac..8932005 100644 ---- a/ext/mysqli/config.m4 -+++ b/ext/mysqli/config.m4 -@@ -59,7 +59,7 @@ elif test "$PHP_MYSQLI" != "no"; then - MYSQL_LIB_CFG='--libmysqld-libs' - dnl mysqlnd doesn't support embedded, so we have to add some extra stuff - mysqli_extra_sources="mysqli_embedded.c" -- elif test "$enable_maintainer_zts" = "yes"; then -+ elif true || test "$enable_maintainer_zts" = "yes"; then - MYSQL_LIB_CFG='--libs_r' - MYSQL_LIB_NAME='mysqlclient_r' - else -diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4 -index c165fb6..2e391eb 100755 ---- a/ext/pdo_mysql/config.m4 -+++ b/ext/pdo_mysql/config.m4 -@@ -67,7 +67,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then - if test "x$SED" = "x"; then - AC_PATH_PROG(SED, sed) - fi -- if test "$enable_maintainer_zts" = "yes"; then -+ if true || test "$enable_maintainer_zts" = "yes"; then - PDO_MYSQL_LIBNAME=mysqlclient_r - PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"` - else |