From 1ada2dd2f9a33f11efc3604bd17e7eec37b05337 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Mon, 25 Jan 2021 00:44:29 +0100 Subject: [PATCH] php7: rename PECLPackage to PHP7PECLPackage to prepare PHP8 transition Signed-off-by: Michael Heimpold --- lang/php7-pecl-dio/Makefile | 2 +- lang/php7-pecl-http/Makefile | 2 +- lang/php7-pecl-imagick/Makefile | 2 +- lang/php7-pecl-krb5/Makefile | 2 +- lang/php7-pecl-libevent/Makefile | 2 +- lang/php7-pecl-mcrypt/Makefile | 2 +- lang/php7-pecl-propro/Makefile | 2 +- lang/php7-pecl-raphf/Makefile | 2 +- lang/php7-pecl-redis/Makefile | 2 +- lang/php7/pecl.mk | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lang/php7-pecl-dio/Makefile b/lang/php7-pecl-dio/Makefile index 4d95138d2f..738ed4bb34 100644 --- a/lang/php7-pecl-dio/Makefile +++ b/lang/php7-pecl-dio/Makefile @@ -28,5 +28,5 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk include ../php7/pecl.mk -$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME))) +$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME))) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php7-pecl-http/Makefile b/lang/php7-pecl-http/Makefile index f15e9a41ca..46e68b2b72 100644 --- a/lang/php7-pecl-http/Makefile +++ b/lang/php7-pecl-http/Makefile @@ -54,5 +54,5 @@ CONFIGURE_ARGS+= \ --with-http-libidnkit-dir=no \ --with-http-libidnkit2-dir=no -$(eval $(call PECLPackage,http,$(PECL_LONGNAME),+icu +libcurl +librt +libevent2 +PACKAGE_libidn:libidn +libidn2 +php7-mod-iconv +php7-mod-session +php7-pecl-raphf +php7-pecl-propro,30)) +$(eval $(call PHP7PECLPackage,http,$(PECL_LONGNAME),+icu +libcurl +librt +libevent2 +PACKAGE_libidn:libidn +libidn2 +php7-mod-iconv +php7-mod-session +php7-pecl-raphf +php7-pecl-propro,30)) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php7-pecl-imagick/Makefile b/lang/php7-pecl-imagick/Makefile index c9c3bdbabc..4582e93735 100644 --- a/lang/php7-pecl-imagick/Makefile +++ b/lang/php7-pecl-imagick/Makefile @@ -29,5 +29,5 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk include ../php7/pecl.mk -$(eval $(call PECLPackage,imagick,$(PECL_LONGNAME),+imagemagick,30)) +$(eval $(call PHP7PECLPackage,imagick,$(PECL_LONGNAME),+imagemagick,30)) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php7-pecl-krb5/Makefile b/lang/php7-pecl-krb5/Makefile index 72d8d90901..1fe42ea230 100644 --- a/lang/php7-pecl-krb5/Makefile +++ b/lang/php7-pecl-krb5/Makefile @@ -33,5 +33,5 @@ CONFIGURE_ARGS+= \ --with-krb5=shared,"$(STAGING_DIR)/usr" \ --with-krb5config=$(STAGING_DIR)/usr/bin/krb5-config -$(eval $(call PECLPackage,krb5,$(PECL_LONGNAME),+krb5-libs,30)) +$(eval $(call PHP7PECLPackage,krb5,$(PECL_LONGNAME),+krb5-libs,30)) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php7-pecl-libevent/Makefile b/lang/php7-pecl-libevent/Makefile index 5383df8494..99a6ca5fe3 100644 --- a/lang/php7-pecl-libevent/Makefile +++ b/lang/php7-pecl-libevent/Makefile @@ -33,5 +33,5 @@ include ../php7/pecl.mk CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr" -$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent2 +php7-mod-sockets,25)) +$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent2 +php7-mod-sockets,25)) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php7-pecl-mcrypt/Makefile b/lang/php7-pecl-mcrypt/Makefile index 3981f5cc6f..2ce01d2032 100644 --- a/lang/php7-pecl-mcrypt/Makefile +++ b/lang/php7-pecl-mcrypt/Makefile @@ -31,5 +31,5 @@ include ../php7/pecl.mk CONFIGURE_ARGS+= --with-mcrypt=shared,"$(STAGING_DIR)/usr" -$(eval $(call PECLPackage,mcrypt,$(PECL_LONGNAME),+libmcrypt +libltdl,30)) +$(eval $(call PHP7PECLPackage,mcrypt,$(PECL_LONGNAME),+libmcrypt +libltdl,30)) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php7-pecl-propro/Makefile b/lang/php7-pecl-propro/Makefile index 3d44731e86..68a0e037c1 100644 --- a/lang/php7-pecl-propro/Makefile +++ b/lang/php7-pecl-propro/Makefile @@ -37,5 +37,5 @@ define Build/InstallDev $(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 PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME))) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php7-pecl-raphf/Makefile b/lang/php7-pecl-raphf/Makefile index e2c3a757fe..a69dce1d9d 100644 --- a/lang/php7-pecl-raphf/Makefile +++ b/lang/php7-pecl-raphf/Makefile @@ -37,5 +37,5 @@ define Build/InstallDev 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 PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME))) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php7-pecl-redis/Makefile b/lang/php7-pecl-redis/Makefile index 7936b19038..bda340c4bb 100644 --- a/lang/php7-pecl-redis/Makefile +++ b/lang/php7-pecl-redis/Makefile @@ -35,5 +35,5 @@ CONFIGURE_ARGS+= \ --disable-redis-lzf \ --disable-redis-msgpack -$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+php7-mod-json +php7-mod-session,25)) +$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+php7-mod-json +php7-mod-session,25)) $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/lang/php7/pecl.mk b/lang/php7/pecl.mk index 6bb19a6906..c851376d9f 100644 --- a/lang/php7/pecl.mk +++ b/lang/php7/pecl.mk @@ -22,7 +22,7 @@ CONFIGURE_VARS+= \ CONFIGURE_ARGS+= \ --with-php-config=$(STAGING_DIR)/usr/bin/php7-config -define PECLPackage +define PHP7PECLPackage define Package/php7-pecl-$(1) $(call Package/php7-pecl/Default)