lede-packages-rs

commit 8eeb9397606e80b167c60167fea56f7fc1371e27
parent edce81222a69f760741d5bc51a34630b33688428
Author: Michael Heimpold <mhei@heimpold.de>
Date:   Wed,  7 Sep 2016 23:22:50 +0200

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>

Diffstat:
M
lang/php7-pecl-propro/Makefile
 | 
8
+++++++-
M
lang/php7-pecl-raphf/Makefile
 | 
8
+++++++-

2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lang/php7-pecl-propro/Makefile b/lang/php7-pecl-propro/Makefile
@@ -21,7 +21,7 @@ PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 PKG_LICENSE:=BSD-2-Clause
 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_FIXUP:=autoreconf
@@ -33,5 +33,11 @@ include ../php7/pecl.mk
 CONFIGURE_ARGS+= \
 	--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 BuildPackage,$(PKG_NAME)))
diff --git a/lang/php7-pecl-raphf/Makefile b/lang/php7-pecl-raphf/Makefile
@@ -21,7 +21,7 @@ PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 PKG_LICENSE:=BSD-2-Clause
 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_FIXUP:=autoreconf
@@ -33,5 +33,11 @@ include ../php7/pecl.mk
 CONFIGURE_ARGS+= \
 	--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 BuildPackage,$(PKG_NAME)))