From 8c6d7dc37c139178a60197834bbab20df265dc33 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 25 Feb 2021 19:09:12 -0300 Subject: [PATCH 1/3] php8: fix build with QUILT This is d4979cff0 ported to php8. Signed-off-by: Eneas U de Queiroz Signed-off-by: Michael Heimpold --- lang/php8/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lang/php8/Makefile b/lang/php8/Makefile index 110727065..45fdf7190 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -529,7 +529,12 @@ endef define Build/Prepare $(call Build/Prepare/Default) - ( cd $(PKG_BUILD_DIR); touch configure.ac; ./buildconf --force ) + $(if $(QUILT),,( cd $(PKG_BUILD_DIR); touch configure.ac; ./buildconf --force )) +endef + +define Build/Configure + $(if $(QUILT),( cd $(PKG_BUILD_DIR); touch configure.ac; ./buildconf --force )) + $(call Build/Configure/Default) endef define Build/InstallDev From db3389edc285d4ba7a23a2bd212d8af5db596dd4 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 25 Feb 2021 12:58:36 -0300 Subject: [PATCH 2/3] php8: fix pecl build with QUILT This is d4979cff0 ported to php8. Signed-off-by: Eneas U de Queiroz Signed-off-by: Michael Heimpold --- lang/php8/pecl.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lang/php8/pecl.mk b/lang/php8/pecl.mk index 29fedfae1..139f5575e 100644 --- a/lang/php8/pecl.mk +++ b/lang/php8/pecl.mk @@ -16,6 +16,11 @@ define Build/Prepare $(if $(QUILT),,( cd $(PKG_BUILD_DIR); $(STAGING_DIR)/usr/bin/phpize8 )) endef +define Build/Configure + $(if $(QUILT),( cd $(PKG_BUILD_DIR); $(STAGING_DIR)/usr/bin/phpize8 )) + $(Build/Configure/Default) +endef + CONFIGURE_VARS+= \ ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no) From e819f630a23858649c0fa2985e852fc7c696a8fc Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Thu, 4 Mar 2021 23:08:55 +0100 Subject: [PATCH 3/3] php8: update to 8.0.3 Also update opcache compile fix patch. Signed-off-by: Michael Heimpold --- lang/php8/Makefile | 4 ++-- ...001-ext-opcache-fix-detection-of-shm-mmap.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lang/php8/Makefile b/lang/php8/Makefile index 45fdf7190..e9637cd23 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=8.0.2 +PKG_VERSION:=8.0.3 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold @@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_HASH:=84dd6e36f48c3a71ff5dceba375c1f6b34b71d4fa9e06b720780127176468ccc +PKG_HASH:=c9816aa9745a9695672951eaff3a35ca5eddcb9cacf87a4f04b9fb1169010251 PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 diff --git a/lang/php8/patches/1001-ext-opcache-fix-detection-of-shm-mmap.patch b/lang/php8/patches/1001-ext-opcache-fix-detection-of-shm-mmap.patch index 4fe7bccd5..969664a20 100644 --- a/lang/php8/patches/1001-ext-opcache-fix-detection-of-shm-mmap.patch +++ b/lang/php8/patches/1001-ext-opcache-fix-detection-of-shm-mmap.patch @@ -44,3 +44,17 @@ Signed-off-by: Michael Heimpold AC_MSG_RESULT([$have_shm_mmap_anon=yes]) PHP_CHECK_FUNC_LIB(shm_open, rt, root) +@@ -294,8 +300,11 @@ int main() { + PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) + ],[ + AC_MSG_RESULT([no]) +- ],[ +- AC_MSG_RESULT([no]) ++ ],[dnl ++ AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) ++ AC_MSG_RESULT([yes]) ++ have_shm_mmap_posix=yes ++ PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) + ]) + + PHP_NEW_EXTENSION(opcache,