package/php_amqp: fix build with php 7.3.0
PATCH v2 1/1 package/php_amqp: fix build with php 7.3.0
This includes an upstream patch that fixes the following error:
```
/home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c: In function 'php_amqp_destroy_fci':
/home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c:104:37: error: lvalue required as decrement operand
GC_REFCOUNT(fci->object)--;
^~
/home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c: In function 'php_amqp_duplicate_fci':
/home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c:115:40: error: lvalue required as increment operand
GC_REFCOUNT(source->object)++;
^~
make[1]: *** [Makefile:206: amqp_channel.lo] Error 1
```The patch was created from the commit at:
https://github.com/pdezwart/php-amqp/commit/1205d3287df0a9ec762a6594b4fa018ed9637d21
Upstream has not yet made an official release that includes it. Fixes:
http://autobuild.buildroot.net/results/222873a689f7b9da20acb3604b8364885e96b98d
http://autobuild.buildroot.net/results/90710cb2a4873f39aa75db79ff70aa9e4bdf83ae
---
Changes v1 -> v2:
- Add SOB to patch
package/php-amqp/0001-fix-for-7.3-323.patch | 43 +++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/php-amqp/0001-fix-for-7.3-323.patch
package/php-amqp/0001-fix-for-7.3-323.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 1205d3287df0a9ec762a6594b4fa018ed9637d21 Mon Sep 17 00:00:00 2001 +From: Remi Collet <[email protected]> +Date: Thu, 21 Jun 2018 11:16:32 +0200 +Subject: [PATCH] fix for 7.3 (#323) + +[Frank: backport from upstream commit 1205d3287df0a9ec762a6594b4fa018ed9637d21] +Signed-off-by: Frank Hunleth <[email protected]> + +--- + amqp_channel.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/amqp_channel.c b/amqp_channel.c +index f3dba5d..032526e 100644 +--- a/amqp_channel.c ++++ b/amqp_channel.c +@@ -101,7 +101,11 @@ static void php_amqp_destroy_fci(zend_fcall_info *fci) { + if (fci->size > 0) { + zval_ptr_dtor(&fci->function_name); + if (fci->object != NULL) { ++#if PHP_VERSION_ID >= 70300 ++ GC_DELREF(fci->object); ++#else + GC_REFCOUNT(fci->object)--; ++#endif + } + fci->size = 0; + } +@@ -112,7 +116,11 @@ static void php_amqp_duplicate_fci(zend_fcall_info *source) { + + zval_add_ref(&source->function_name); + if (source->object != NULL) { ++#if PHP_VERSION_ID >= 70300 ++ GC_ADDREF(source->object); ++#else + GC_REFCOUNT(source->object)++; ++#endif + } + } + } +-- +2.17.1 +
--
2.17.1
Thomas Petazzoni
AppliedPATCH v2 1/1 package/php_amqp: fix build with php 7.3.0
Hello,
Quoted 20 lines · Frank Hunleth
This includes an upstream patch that fixes the following error:
``` /home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c: In function 'php_amqp_destroy_fci': /home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c:104:37: error: lvalue required as decrement operand GC_REFCOUNT(fci->object)--; ^~ /home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c: In function 'php_amqp_duplicate_fci': /home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c:115:40: error: lvalue required as increment operand GC_REFCOUNT(source->object)++; ^~ make[1]: *** [Makefile:206: amqp_channel.lo] Error 1 ```The patch was created from the commit at:
https://github.com/pdezwart/php-amqp/commit/1205d3287df0a9ec762a6594b4fa018ed9637d21
Upstream has not yet made an official release that includes it. Fixes:
Quoted 7 lines
http://autobuild.buildroot.net/results/222873a689f7b9da20acb3604b8364885e96b98d
http://autobuild.buildroot.net/results/90710cb2a4873f39aa75db79ff70aa9e4bdf83aeSigned-off-by Frank Hunleth <[email protected]>---
Changes v1 -> v2:
- Add SOB to patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/1 package/php_amqp: fix build with php 7.3.0
In reply to Frank HunlethHello,
Quoted 13 lines · Frank Hunleth
This includes an upstream patch that fixes the following error:
``` /home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c: In function 'php_amqp_destroy_fci': /home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c:104:37: error: lvalue required as decrement operand GC_REFCOUNT(fci->object)--; ^~ /home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c: In function 'php_amqp_duplicate_fci': /home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c:115:40: error: lvalue required as increment operand GC_REFCOUNT(source->object)++; ^~ make[1]: *** [Makefile:206: amqp_channel.lo] Error 1 ```
Don't we need a similar fix for php-zmq ?
See:
http://autobuild.buildroot.org/results/3f2/3f258fbc7352c3d7205bc6402145be1102d69683/build-end.log
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/1 package/php_amqp: fix build with php 7.3.0
Quoted 18 lines · Thomas Petazzoni
Hello,
Quoted 13 lines · Frank Hunleth
This includes an upstream patch that fixes the following error:
``` /home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c: In function 'php_amqp_destroy_fci': /home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c:104:37: error: lvalue required as decrement operand GC_REFCOUNT(fci->object)--; ^~ /home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c: In function 'php_amqp_duplicate_fci': /home/naourr/work/instance-1/output/build/php-amqp-1.9.3/amqp_channel.c:115:40: error: lvalue required as increment operand GC_REFCOUNT(source->object)++; ^~ make[1]: *** [Makefile:206: amqp_channel.lo] Error 1 ```
Quoted 1 line
Don't we need a similar fix for php-zmq ?
Yes - I just sent a patch up.
Frank