From e148924a4c2935007ded7f4f05c0bd63016c5b00 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Sat, 9 Feb 2019 13:35:53 +0100 Subject: [PATCH] php7: update to 7.2.15 Also refresh patch which does not apply cleanly anymore. Signed-off-by: Michael Heimpold --- lang/php7/Makefile | 4 +-- .../1003-Fix-dl-cross-compiling-issue.patch | 29 ++++--------------- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/lang/php7/Makefile b/lang/php7/Makefile index a36dfbb1f2..f096552762 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=7.2.14 +PKG_VERSION:=7.2.15 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold @@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_HASH:=ee3f1cc102b073578a3c53ba4420a76da3d9f0c981c02b1664ae741ca65af84f +PKG_HASH:=75e90012faef700dffb29311f3d24fa25f1a5e0f70254a9b8d5c794e25e938ce PKG_FIXUP:=libtool autoreconf PKG_BUILD_PARALLEL:=1 diff --git a/lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch b/lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch index 5359ab9970..951b32573e 100644 --- a/lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch +++ b/lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -453,7 +453,10 @@ PHP_CHECK_FUNC(gethostname, nsl) +@@ -422,7 +422,10 @@ PHP_CHECK_FUNC(gethostname, nsl) PHP_CHECK_FUNC(gethostbyaddr, nsl) PHP_CHECK_FUNC(yp_get_default_domain, nsl) @@ -27,33 +27,16 @@ PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 -@@ -227,7 +227,14 @@ AC_TRY_RUN([ +@@ -261,7 +261,11 @@ AC_TRY_RUN([ + ], [ flock_type=linux AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) - AC_MSG_RESULT("yes") --], AC_MSG_RESULT("no") ) -+], [ -+ AC_MSG_RESULT("no") +-], []) +], [ + dnl cross-compiling; assume Linux + flock_type=linux + AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) -+ AC_MSG_RESULT("yes") +]) + fi - AC_MSG_CHECKING("whether flock struct is BSD ordered") - AC_TRY_RUN([ -@@ -243,7 +250,12 @@ AC_TRY_RUN([ - flock_type=bsd - AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) - AC_MSG_RESULT("yes") --], AC_MSG_RESULT("no") ) -+], [ -+ AC_MSG_RESULT("no") -+], [ -+ dnl cross-compiling; assume Linux -+ AC_MSG_RESULT("no") -+]) - - if test "$flock_type" == "unknown"; then - AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) + if test "$flock_type" = "unknown"; then