cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-24 21:14:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

php7: fix build with QUILT

Browse Source 
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 <cotequeiroz@gmail.com>
(cherry picked from commit d4979cff06)
This commit is contained in:
Eneas U de Queiroz
2021-02-25 19:09:12 -03:00
committed by Josef Schlehofer
parent 6e200ab632
commit 8d8d71b87d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lang/php7/Makefile
View File

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=php PKG_NAME:=php
PKG_VERSION:=7.4.15 PKG_VERSION:=7.4.15
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
PKG_LICENSE:=PHP-3.01 PKG_LICENSE:=PHP-3.01
@@ -530,7 +530,12 @@ endef
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(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 endef
define Build/InstallDev define Build/InstallDev