diff options
| author | Michael Heimpold <mhei@heimpold.de> | 2017-06-10 15:06:53 +0200 |
|---|---|---|
| committer | Michael Heimpold <mhei@heimpold.de> | 2017-06-10 15:06:53 +0200 |
| commit | d6c333b705e53b99bd216f0a7e5c22aa493dfefc (patch) | |
| tree | 0cfa788a376eab7136af99f7d50edbdeb9050859 /lang/php7 | |
| parent | 03ae8210dabda55e9fda6054b9e0db94f523c3c6 (diff) | |
php7: update to 7.1.6
Removed patch 1008-fix-musl-sys-headers.patch which was integrated
upstream.
(Compile tested only so far)
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/1008-fix-musl-sys-headers.patch | 62 |
2 files changed, 3 insertions, 65 deletions
diff --git a/lang/php7/Makefile b/lang/php7/Makefile index 1ff81bdb7..f7bdd66ef 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=7.1.5 +PKG_VERSION:=7.1.6 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> @@ -16,8 +16,8 @@ PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_MD5SUM:=fb0702321c7aceac68c82b8c7a10d196 -PKG_HASH:=d149a3c396c45611f5dc6bf14be190f464897145a76a8e5851cf18ff7094f6ac +PKG_MD5SUM:=eafc7a79cc8cc62c9292c96f9c9ccf90 +PKG_HASH:=01584dc521ab7ec84b502b61952f573652fe6aa00c18d6d844fb9209f14b245b PKG_FIXUP:=libtool autoreconf PKG_BUILD_PARALLEL:=1 diff --git a/lang/php7/patches/1008-fix-musl-sys-headers.patch b/lang/php7/patches/1008-fix-musl-sys-headers.patch deleted file mode 100644 index dc6400261..000000000 --- a/lang/php7/patches/1008-fix-musl-sys-headers.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -494,6 +494,7 @@ limits.h \ - locale.h \ - monetary.h \ - netdb.h \ -+poll.h \ - pwd.h \ - resolv.h \ - signal.h \ ---- a/main/fastcgi.c -+++ b/main/fastcgi.c -@@ -76,7 +76,9 @@ static int is_impersonate = 0; - # include <netdb.h> - # include <signal.h> - --# if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL) -+# if defined(HAVE_POLL_H) && defined(HAVE_POLL) -+# include <poll.h> -+# elif defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL) - # include <sys/poll.h> - # endif - # if defined(HAVE_SYS_SELECT_H) -@@ -1427,7 +1429,7 @@ int fcgi_accept_request(fcgi_request *req) - break; - #else - if (req->fd >= 0) { --#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL) -+#if defined(HAVE_POLL) - struct pollfd fds; - int ret; - ---- a/main/network.c -+++ b/main/network.c -@@ -51,7 +51,9 @@ - #ifdef HAVE_SYS_SELECT_H - #include <sys/select.h> - #endif --#if HAVE_SYS_POLL_H -+#if HAVE_POLL_H -+#include <poll.h> -+#elif HAVE_SYS_POLL_H - #include <sys/poll.h> - #endif - ---- a/main/php_network.h -+++ b/main/php_network.h -@@ -120,8 +120,12 @@ typedef int php_socket_t; - /* uncomment this to debug poll(2) emulation on systems that have poll(2) */ - /* #define PHP_USE_POLL_2_EMULATION 1 */ - --#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL) --# include <poll.h> -+#if defined(HAVE_POLL) -+# if defined(HAVE_POLL_H) -+# include <poll.h> -+# elif defined(HAVE_SYS_POLL_H) -+# include <sys/poll.h> -+# endif - typedef struct pollfd php_pollfd; - #else - typedef struct _php_pollfd { |