php7/php7-pecl-*: introduce load order

Some PECL modules (possibly also php modules) depend on
special load order, otherwise loading the module will fail
due to unresolvable symbols.

This changeset introduces a very simple compile-time defined
order by specifying a prefix for the ini file with the load
directive. If not given, it uses a default value.

It also updates all current pecl module packages to take
this new approach.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

diff --git a/lang/php7-pecl-dio/Makefile b/lang/php7-pecl-dio/Makefile
index 1f77c013725576c4c5e341cd85cca8ef983d2b51..cbb5b2dc96f1f99c6507f3f1c64009a7bcc9a20e 100644 (file)
--- a/lang/php7-pecl-dio/Makefile
+++ b/lang/php7-pecl-dio/Makefile
@@ -9,7 +9,7 @@ PECL_NAME:=dio
 PECL_LONGNAME:=Direct I/O functions
 
 PKG_VERSION:=0.0.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=a1a4df428a17dbe1ab4277b492dfa052
 
 PKG_NAME:=php7-pecl-$(PECL_NAME)

diff --git a/lang/php7-pecl-propro/Makefile b/lang/php7-pecl-propro/Makefile
index 005dd4384b995a9cf25dd027b1b168bdaa1aab33..eba6dae7b87ec8b2457b522c8b333707f27f9cf4 100644 (file)
--- a/lang/php7-pecl-propro/Makefile
+++ b/lang/php7-pecl-propro/Makefile
@@ -9,7 +9,7 @@ PECL_NAME:=propro
 PECL_LONGNAME:=Property proxy
 
 PKG_VERSION:=2.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=19f9517210a87e18cc09faed262e1522
 
 PKG_NAME:=php7-pecl-propro

diff --git a/lang/php7-pecl-raphf/Makefile b/lang/php7-pecl-raphf/Makefile
index 6471e165e866dcbf657b25d94f3723caace5dfd5..488270415657d545d7219a8450acbd20bdc93143 100644 (file)
--- a/lang/php7-pecl-raphf/Makefile
+++ b/lang/php7-pecl-raphf/Makefile
@@ -9,7 +9,7 @@ PECL_NAME:=raphf
 PECL_LONGNAME:=Resource and persistent handles factory
 
 PKG_VERSION:=2.0.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=bc465eb5caa9d0f09cced121a8ac2e8e
 
 PKG_NAME:=php7-pecl-raphf

diff --git a/lang/php7/Makefile b/lang/php7/Makefile
index 82e73fe9d6d0643f33098ba5932cb1a223f513fe..1e5a0954be762e72b12a507487565ff2fca94830 100644 (file)
--- a/lang/php7/Makefile
+++ b/lang/php7/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
 PKG_VERSION:=7.0.10
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 
@@ -527,10 +527,10 @@ define BuildModule
        $(INSTALL_DIR) $$(1)/usr/lib/php
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/
        $(INSTALL_DIR) $$(1)/etc/php7
-      ifeq ($(4),zend)
-       echo "zend_extension=/usr/lib/php/$(subst -,_,$(1)).so" > $$(1)/etc/php7/$(subst -,_,$(1)).ini
+      ifeq ($(5),zend)
+       echo "zend_extension=/usr/lib/php/$(subst -,_,$(1)).so" > $$(1)/etc/php7/$(if $(4),$(4),20)_$(subst -,_,$(1)).ini
       else
-       echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php7/$(subst -,_,$(1)).ini
+       echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php7/$(if $(4),$(4),20)_$(subst -,_,$(1)).ini
     endif
   endef
 
@@ -563,7 +563,7 @@ $(eval $(call BuildModule,ldap,LDAP,+PACKAGE_php7-mod-ldap:libopenldap +PACKAGE_
 $(eval $(call BuildModule,mbstring,MBString))
 $(eval $(call BuildModule,mcrypt,Mcrypt,+PACKAGE_php7-mod-mcrypt:libmcrypt +PACKAGE_php7-mod-mcrypt:libltdl))
 $(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php7-mod-mysqli:libmysqlclient))
-$(eval $(call BuildModule,opcache,OPcache,,zend))
+$(eval $(call BuildModule,opcache,OPcache,,,zend))
 $(eval $(call BuildModule,openssl,OpenSSL,+PACKAGE_php7-mod-openssl:libopenssl))
 $(eval $(call BuildModule,pcntl,PCNTL))
 $(eval $(call BuildModule,pdo,PHP Data Objects))

diff --git a/lang/php7/pecl.mk b/lang/php7/pecl.mk
index 79715560e471f87ce2f4b4be763ffebf2a8b3133..7b7c2442b77c15107eadcb6f98070674153f6ae6 100644 (file)
--- a/lang/php7/pecl.mk
+++ b/lang/php7/pecl.mk
@@ -34,10 +34,10 @@ define PECLPackage
        $(INSTALL_DIR) $$(1)/usr/lib/php
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/
        $(INSTALL_DIR) $$(1)/etc/php7
-    ifeq ($(4),zend)
-       echo "zend_extension=/usr/lib/php/$(subst -,_,$(1)).so" > $$(1)/etc/php7/$(subst -,_,$(1)).ini
+    ifeq ($(5),zend)
+       echo "zend_extension=/usr/lib/php/$(subst -,_,$(1)).so" > $$(1)/etc/php7/$(if $(4),$(4),20)_$(subst -,_,$(1)).ini
     else
-       echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php7/$(subst -,_,$(1)).ini
+       echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php7/$(if $(4),$(4),20)_$(subst -,_,$(1)).ini
     endif
   endef