package/php-amqp: bump version to 2.0.0
Drop upstream patches Signed-off-by: Adam Duskett <aduskett@gmail.comm> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
9bf196ce28
commit
1c0ec66203
@ -1110,8 +1110,6 @@ package/pdmenu/0002-Makefile-autoconf-makeinfo.in-support-build-install-.patch U
|
||||
package/perl-net-ssleay/0001-fix-build-system.patch Upstream
|
||||
package/perl-sys-cpu/0001-remove-extraneous-include.patch Upstream
|
||||
package/perl-xml-libxml/0001-Makefile-PL.patch Upstream
|
||||
package/php-amqp/0001-add-build-support-for-php-8.patch Upstream
|
||||
package/php-amqp/0002-more-work-for-php-8.patch Upstream
|
||||
package/php-geoip/0001-add-build-support-for-php8.patch Upstream
|
||||
package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch Upstream
|
||||
package/php-lua/0001-ZEND_ACC_ALLOW_STATIC-ZEND_ACC_STATIC-for-static-met.patch Upstream
|
||||
|
@ -1,54 +0,0 @@
|
||||
From 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438 Mon Sep 17 00:00:00 2001
|
||||
From: mmokhi <mokhi64@gmail.com>
|
||||
Date: Thu, 30 Jul 2020 11:25:33 +0200
|
||||
Subject: [PATCH] Add build support for PHP8.0 (#381)
|
||||
|
||||
From upstream commit: 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438
|
||||
|
||||
Signed-off-by: mmokhi <mokhi64@gmail.com>
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
amqp_envelope.h | 7 +++++++
|
||||
php7_support.h | 11 +++++++++++
|
||||
2 files changed, 18 insertions(+)
|
||||
|
||||
diff --git a/amqp_envelope.h b/amqp_envelope.h
|
||||
index e63a3a5..e315682 100644
|
||||
--- a/amqp_envelope.h
|
||||
+++ b/amqp_envelope.h
|
||||
@@ -20,6 +20,13 @@
|
||||
| - Jonathan Tansavatdi |
|
||||
+----------------------------------------------------------------------+
|
||||
*/
|
||||
+
|
||||
+#if PHP_MAJOR_VERSION >= 7
|
||||
+ #include "php7_support.h"
|
||||
+#else
|
||||
+ #include "php5_support.h"
|
||||
+#endif
|
||||
+
|
||||
extern zend_class_entry *amqp_envelope_class_entry;
|
||||
|
||||
void convert_amqp_envelope_to_zval(amqp_envelope_t *amqp_envelope, zval *envelope TSRMLS_DC);
|
||||
diff --git a/php7_support.h b/php7_support.h
|
||||
index 47ce983..c9e8f5b 100644
|
||||
--- a/php7_support.h
|
||||
+++ b/php7_support.h
|
||||
@@ -101,6 +101,17 @@ typedef zval PHP5to7_zend_resource_le_t;
|
||||
|
||||
#define PHP5to7_ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL
|
||||
|
||||
+/* Small change to let it build after a major internal change for php8.0
|
||||
+ * More info:
|
||||
+ * https://github.com/php/php-src/blob/php-8.0.0alpha3/UPGRADING.INTERNALS#L47
|
||||
+ */
|
||||
+#if PHP_MAJOR_VERSION >= 8
|
||||
+# define TSRMLS_DC
|
||||
+# define TSRMLS_D
|
||||
+# define TSRMLS_CC
|
||||
+# define TSRMLS_C
|
||||
+# endif
|
||||
+
|
||||
#endif //PHP_AMQP_PHP7_SUPPORT_H
|
||||
|
||||
/*
|
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 0ebc61052eb12406dddf5eabfe8749a12d52c566816b8aab04fb9916d0c26ed2 amqp-1.10.2.tgz
|
||||
sha256 2de740da9a884ade2caf0e59e5521bbf80da16155fa6a6205630b473aed5e6dd amqp-2.0.0.tgz
|
||||
sha256 ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8 LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PHP_AMQP_VERSION = 1.10.2
|
||||
PHP_AMQP_VERSION = 2.0.0
|
||||
PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz
|
||||
PHP_AMQP_SITE = https://pecl.php.net/get
|
||||
PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
|
||||
|
Loading…
Reference in New Issue
Block a user