gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-01-09 19:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

php7: update to 7.2.15

Browse Source 
Also refresh patch which does not apply cleanly anymore.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit e148924a4c)
This commit is contained in:
Michael Heimpold
2019-02-09 13:35:53 +01:00
parent ef57201aa9
commit 00f6119bd2
2 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch
View File

@@ -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