From: Eneas U de Queiroz <cotequeiroz@gmail.com>
Date: Thu, 25 Feb 2021 15:58:36 +0000 (-0300)
Subject: php7: fix pecl build with QUILT
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6e200ab63243ba2ea64d2bdafaca8c099f4df4f8;p=feed%2Fpackages.git

php7: fix pecl build with QUILT

Commit d741a64b7 ("lang/php7: Don't run phpize7 with QUILT") changed
pecl.mk to not run phpize7 during Package/prepare if QUILT is set.  The
intention was to allow prepare, refresh and update targets to run
without building dependencies.

As a side-effect, Package/configure and Package/compile fail when QUILT
is defined because they can't find ./configure or a Makefile.  It also
impacts the github tests run with pull requests, because QUILT is
defined there.

To avoid that failure and still keep the prepare, refresh, and update
speedup, call phpize7 before Package/Configure if QUILT is defined.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
(cherry picked from commit 3476816cc8f03dcd7d118bb1faf77a9ef224d66f)
---

diff --git a/lang/php7/pecl.mk b/lang/php7/pecl.mk
index d85e8d1399..faa8b090fe 100644
--- a/lang/php7/pecl.mk
+++ b/lang/php7/pecl.mk
@@ -16,6 +16,11 @@ define Build/Prepare
 	$(if $(QUILT),,( cd $(PKG_BUILD_DIR); $(STAGING_DIR)/usr/bin/phpize7 ))
 endef
 
+define Build/Configure
+	$(if $(QUILT),( cd $(PKG_BUILD_DIR); $(STAGING_DIR)/usr/bin/phpize7 ))
+	$(Build/Configure/Default)
+endef
+
 CONFIGURE_VARS+= \
 	ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no)