cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-29 23:18:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

php7-pecl-http: fix build when php5 is build in parallel (fixes #3149)

Browse Source 
- remove hack to find required packages: when php5-pecl-{raphf,propro}
  was built in paralle, then the hack could not determine which build
  directory must be used; this was resolved by a previous commit, both
  packages now install their header files in the staging area so that
  this pecl module will find it properly

- refine build dir to avoid collision with (possible) php5 package variant

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
This commit is contained in:
Michael Heimpold
2016-09-07 23:25:50 +02:00
parent 8eeb939760
commit f6c3de0925
3 changed files with 2 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/php7-pecl-http/Makefile
+2 -5
View File
@@ -22,7 +22,7 @@ PKG_LICENSE:=BSD-2-Clause
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:=php7 php7-pecl-propro php7-pecl-raphf
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf
@@ -40,10 +40,7 @@ CONFIGURE_ARGS+= \
--without-http-shared-deps \
--with-http-libcurl-dir="$(STAGING_DIR)/usr" \
--with-http-libevent-dir="$(STAGING_DIR)/usr" \
--with-http-libidn-dir="$(STAGING_DIR)/usr" \
--with-http-pecl-propro-dir="$(shell echo $(BUILD_DIR)/propro-*)" \
--with-http-pecl-raphf-dir="$(shell echo $(BUILD_DIR)/raphf-*)" \
--with-http-libidn-dir="$(STAGING_DIR)/usr"
$(eval $(call PECLPackage,http,$(PECL_LONGNAME),+libcurl +librt +libevent2 +libidn +php7-mod-iconv +php7-mod-session +php7-pecl-raphf +php7-pecl-propro,30))
$(eval $(call BuildPackage,$(PKG_NAME)))