Skip to content

Commit

Permalink
php7: fix pecl build with QUILT
Browse files Browse the repository at this point in the history
Commit d741a64 ("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 <[email protected]>
  • Loading branch information
cotequeiroz committed Feb 26, 2021
1 parent d820319 commit 3476816
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions lang/php7/pecl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 3476816

Please sign in to comment.