Browse Source

php7-pecl-{propro,raphf}: fix two problems (refs #3149)

- refine build dir to avoid collisions with php5 package variants
- properly install headers to location where depended packages look for it

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
lilik-openwrt-22.03
Michael Heimpold 8 years ago
parent
commit
8eeb939760
2 changed files with 14 additions and 2 deletions
  1. +7
    -1
      lang/php7-pecl-propro/Makefile
  2. +7
    -1
      lang/php7-pecl-raphf/Makefile

+ 7
- 1
lang/php7-pecl-propro/Makefile View File

@ -21,7 +21,7 @@ PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
PKG_LICENSE:=BSD-2-Clause PKG_LICENSE:=BSD-2-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
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_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
@ -33,5 +33,11 @@ include ../php7/pecl.mk
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-propro --enable-propro
define Build/InstallDev
mkdir -p $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)
$(CP) $(PKG_BUILD_DIR)/php_propro.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
$(CP) $(PKG_BUILD_DIR)/php_propro_api.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
endef
$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME))) $(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
$(eval $(call BuildPackage,$(PKG_NAME))) $(eval $(call BuildPackage,$(PKG_NAME)))

+ 7
- 1
lang/php7-pecl-raphf/Makefile View File

@ -21,7 +21,7 @@ PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
PKG_LICENSE:=BSD-2-Clause PKG_LICENSE:=BSD-2-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
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_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
@ -33,5 +33,11 @@ include ../php7/pecl.mk
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-raphf --enable-raphf
define Build/InstallDev
mkdir -p $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)
cp $(PKG_BUILD_DIR)/php_raphf.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
cp $(PKG_BUILD_DIR)/php_raphf_api.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
endef
$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME))) $(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
$(eval $(call BuildPackage,$(PKG_NAME))) $(eval $(call BuildPackage,$(PKG_NAME)))

Loading…
Cancel
Save