From: Frank Hunleth <fhunleth@troodon-software.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 1/1] package/php_amqp: fix build with php 7.3.0
Date: Mon, 31 Dec 2018 11:07:14 -0500 [thread overview]
Message-ID: <20181231160714.94082-1-fhunleth@troodon-software.com> (raw)
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
Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
---
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
diff --git a/package/php-amqp/0001-fix-for-7.3-323.patch b/package/php-amqp/0001-fix-for-7.3-323.patch
new file mode 100644
index 0000000000..7e3df6fc09
--- /dev/null
+++ b/package/php-amqp/0001-fix-for-7.3-323.patch
@@ -0,0 +1,43 @@
+From 1205d3287df0a9ec762a6594b4fa018ed9637d21 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@famillecollet.com>
+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 <fhunleth@troodon-software.com>
+
+---
+ 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
next reply other threads:[~2018-12-31 16:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-31 16:07 Frank Hunleth [this message]
2018-12-31 16:15 ` [Buildroot] [PATCH v2 1/1] package/php_amqp: fix build with php 7.3.0 Thomas Petazzoni
2018-12-31 16:31 ` Thomas Petazzoni
2019-01-04 4:55 ` Frank Hunleth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181231160714.94082-1-fhunleth@troodon-software.com \
--to=fhunleth@troodon-software.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.