Skip to content
Snippets Groups Projects
Verified Commit 3b99b329 authored by Michal Vasilek's avatar Michal Vasilek Committed by Josef Schlehofer
Browse files

php7: update to 7.4

php7-mod-hash is now in the php7 package, so dependencies on that
package are dropped
parent 7dd72b8b
Branches
Tags
1 merge request!538Turris OS 5.4
This diff is collapsed.
From eff00d9d1b6a52bbab161db291565c3fd5698df8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal.vasilek@nic.cz>
Date: Thu, 23 Jun 2022 11:35:50 +0200
Subject: [PATCH 4/5] php7-pecl-http: remove obsolete php7-mod-hash dep
---
lang/php7-pecl-http/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lang/php7-pecl-http/Makefile b/lang/php7-pecl-http/Makefile
index 68079048b..c9fb99c59 100644
--- a/lang/php7-pecl-http/Makefile
+++ b/lang/php7-pecl-http/Makefile
@@ -9,7 +9,7 @@ PECL_NAME:=pecl_http
PECL_LONGNAME:=Extended HTTP Support
PKG_VERSION:=3.2.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_HASH:=6fb7f038365fb1f3302f1b7e7d6b55d5c422bdea36057b1efe02bbe6ad3cc01b
PKG_NAME:=php7-pecl-http
@@ -56,5 +56,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-hash +php7-mod-iconv +php7-mod-session +php7-pecl-raphf +php7-pecl-propro,30))
+$(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 BuildPackage,$(PKG_NAME)))
--
2.36.1
From 29044be0e33a00fbd22ddb0c4b47c203014457a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal.vasilek@nic.cz>
Date: Thu, 23 Jun 2022 11:36:06 +0200
Subject: [PATCH 5/5] php7-pecl-redis: remove obsolete php7-mod-hash dep
---
lang/php7-pecl-redis/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lang/php7-pecl-redis/Makefile b/lang/php7-pecl-redis/Makefile
index 71f9ee9a6..97368f118 100644
--- a/lang/php7-pecl-redis/Makefile
+++ b/lang/php7-pecl-redis/Makefile
@@ -9,7 +9,7 @@ PECL_NAME:=redis
PECL_LONGNAME:=PHP extension for interfacing with Redis
PKG_VERSION:=4.3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_HASH:=c0f04cec349960a842b60920fb8a433656e2e494eaed6e663397d67102a51ba2
PKG_NAME:=php7-pecl-redis
@@ -35,5 +35,5 @@ CONFIGURE_ARGS+= \
--disable-redis-igbinary \
--disable-redis-lzf
-$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+php7-mod-hash +php7-mod-session,25))
+$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+php7-mod-session,25))
$(eval $(call BuildPackage,$(PKG_NAME)))
--
2.36.1
From de3663674e5a8aa2a0f1246cdffe1a6ffd123d15 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal.vasilek@nic.cz>
Date: Tue, 21 Jun 2022 17:46:36 +0200
Subject: [PATCH 1/5] libgd: install pkgconfig file
---
libs/libgd/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile
index 1c32fa10c..0b2c998f6 100644
--- a/libs/libgd/Makefile
+++ b/libs/libgd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libgd
PKG_VERSION:=2.2.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/gd-$(PKG_VERSION)/
@@ -104,6 +104,8 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,la,so*} $(1)/usr/lib/
$(INSTALL_DIR) $(2)/bin
$(LN) ../../usr/bin/gdlib-config $(2)/bin/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gdlib.pc $(1)/usr/lib/pkgconfig/gdlib.pc
endef
define Package/libgd/install
--
2.36.1
From 36a18cd0c22f3618cd1414eb79609037a19e1207 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal.vasilek@nic.cz>
Date: Tue, 21 Jun 2022 17:57:04 +0200
Subject: [PATCH 2/5] cyrus-sasl: install pkgconfig file
---
libs/cyrus-sasl/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libs/cyrus-sasl/Makefile b/libs/cyrus-sasl/Makefile
index 04796f3b3..afabd402b 100644
--- a/libs/cyrus-sasl/Makefile
+++ b/libs/cyrus-sasl/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cyrus-sasl
PKG_VERSION:=2.1.27
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -101,6 +101,8 @@ define Build/InstallDev
ln -sf libsasl2.so $(1)/usr/lib/libsasl.so
$(INSTALL_DIR) $(1)/usr/lib/sasl2
$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.{a,so*} $(1)/usr/lib/sasl2/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libsasl2.pc $(1)/usr/lib/pkgconfig/libsasl2.pc
endef
define Package/libsasl2/install
--
2.36.1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment