From 2cd9dcf3c88a460996e15f8db4e88e0bdb61a077 Mon Sep 17 00:00:00 2001 From: Sir-Boops Date: Thu, 16 Feb 2017 06:57:14 -0700 Subject: [PATCH] PHP: update to 7.1.1 (#5746) --- srcpkgs/php/patches/php-tidy.patch | 11 ----------- srcpkgs/php/template | 9 ++++----- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/php/patches/php-tidy.patch diff --git a/srcpkgs/php/patches/php-tidy.patch b/srcpkgs/php/patches/php-tidy.patch deleted file mode 100644 index 24386d5f6d5..00000000000 --- a/srcpkgs/php/patches/php-tidy.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/tidy/tidy.c.orig -+++ ext/tidy/tidy.c -@@ -31,7 +31,7 @@ - #include "ext/standard/info.h" - - #include "tidy.h" --#include "buffio.h" -+#include "tidybuffio.h" - - /* compatibility with older versions of libtidy */ - #ifndef TIDY_CALL diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 068900bbb19..fc3aac4df83 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,13 +1,13 @@ # Template build file for 'php' pkgname=php -version=7.0.14 +version=7.1.1 revision=1 short_desc="An HTML-embedded scripting language" maintainer="Steve Prybylski " license="PHP" homepage="http://www.php.net" hostmakedepends="pkg-config bison" -makedepends="postgresql-libs-devel libldap-devel libvpx-devel sqlite-devel +makedepends="postgresql-libs-devel libldap-devel sqlite-devel unixodbc-devel freetds-devel net-snmp-devel libzip-devel enchant-devel libmcrypt-devel libltdl-devel libpng-devel libjpeg-turbo-devel icu-devel libcurl-devel libxslt-devel libressl-devel bzip2-devel zlib-devel db-devel @@ -15,7 +15,7 @@ makedepends="postgresql-libs-devel libldap-devel libvpx-devel sqlite-devel readline-devel libmysqlclient-devel" conf_files="/etc/php/php.ini" distfiles="http://www.php.net/distributions/php-${version}.tar.gz" -checksum=320cfd2184e7252d3d77eae5d5474554fa04ab9fbee7c6094c07e8bd3b5b632b +checksum=c136279d539c3c2c25176bf149c14913670e79bb27ee6b73e1cd69003985a70d # Needs (probably a lot of) work to make it cross compile nocross="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/16307/steps/shell_3/logs/stdio" @@ -56,6 +56,7 @@ do_build() { --enable-sysvsem=shared \ --enable-sysvshm=shared \ --enable-zip=shared \ + --enable-mysqlnd \ --with-bz2=shared \ --with-curl=shared \ --with-db4=/usr \ @@ -68,13 +69,11 @@ do_build() { --with-iconv=shared \ --with-icu-dir=/usr \ --with-jpeg-dir=/usr \ - --with-vpx-dir=/usr \ --with-ldap=shared \ --with-ldap-sasl \ --with-mcrypt=shared \ --with-mhash \ --with-mysql-sock=/run/mysqld/mysqld.sock \ - --with-mysql=shared,mysqlnd \ --with-mysqli=shared,mysqlnd \ --with-openssl=shared \ --with-pcre-regex=/usr \