From 8d8d71b87daa0656224b9f39e9b84223b6ee2c69 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 25 Feb 2021 19:09:12 -0300 Subject: [PATCH] php7: fix build with QUILT When building with QUILT, unlike the regular build, Build/Prepare does not apply the patches. So when buildconf is called with QUILT on, at the end of Build/Prepare, it will not have the patched sources, and build will fail. To fix the problem, run buildconf in Build/Prepare only when QUILT is off, and do it in Build/Configure otherwise. Signed-off-by: Eneas U de Queiroz (cherry picked from commit d4979cff06b29ec4c8201d619bbb452b34bb1175) --- lang/php7/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lang/php7/Makefile b/lang/php7/Makefile index 0f49819f98..96268e5644 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=7.4.15 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Michael Heimpold PKG_LICENSE:=PHP-3.01 @@ -530,7 +530,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 -- 2.30.2