From patchwork Mon Dec 31 16:07:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Hunleth X-Patchwork-Id: 1019647 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=troodon-software.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=troodon-software-com.20150623.gappssmtp.com header.i=@troodon-software-com.20150623.gappssmtp.com header.b="wCuGv30j"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43T2KN4d4Nz9s2P for ; Tue, 1 Jan 2019 03:08:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 39AC886963; Mon, 31 Dec 2018 16:08:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Id3oVKpyhoWf; Mon, 31 Dec 2018 16:08:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C649E8678E; Mon, 31 Dec 2018 16:08:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 371F71BF2EE for ; Mon, 31 Dec 2018 16:08:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 342FA22CCE for ; Mon, 31 Dec 2018 16:08:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T5mglcNil1Qg for ; Mon, 31 Dec 2018 16:08:01 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by silver.osuosl.org (Postfix) with ESMTPS id 8E9792279B for ; Mon, 31 Dec 2018 16:08:01 +0000 (UTC) Received: by mail-qk1-f176.google.com with SMTP id r71so15832021qkr.10 for ; Mon, 31 Dec 2018 08:08:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troodon-software-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=UILCI8AfJBhqzTWMFiRafvy40lAMMduTr8r2jXxlb/g=; b=wCuGv30jvjRodZFzqTxqpb9/z5lUJV1+2vnRBc5aIyIyIu7zLEqsEziaC/WUXF6IYZ de5ljdkWLh9+Q8weyp4VP7YphQ1LMLVQJGFiXj7JtgIWc1DbRpWi0CCEk9nLDQf1vMis pwNiI5goHKS7VTnvFFsvfWRclegQ/gFJnYwf9tZQhY1eZ6lvhPG5zH0+OmoR1MBP2amo UjY2UNXasB44uceMSGNXJ4Q+f9MV9mqnX4teDmgRb2BqJRJsKRxQd+l7o6WLaHEiduXY fYQa6sv2XO0BJf++jZ9aoDNJglskyjgPAjC5Cc7Q8xJ2lbyJGc8n7kUR5G48wwpNeXkU nzWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UILCI8AfJBhqzTWMFiRafvy40lAMMduTr8r2jXxlb/g=; b=fW4R31uKNBFCysRH7J0GoMo5TV+7eEue0d1pIa/pyrtfFdEBMhwjmwLjBJCaY9f+MI xvhKZx7/U6BhEcPecRAfUUwhonV2fIDNxFyHK99pMnHdXbt/rHttBZPeakDbx/lLP6TA lWRaWtQV4H9o0RwUiOugw79WOkYljO5zcV6psZzpkRRA2FZG5695ppqlppwjYSp3Yj5S RkccYZITxvK/mG5VxhVuidSBu9QepuE3i7lZ7GGmcAqoBNrH1/rkD7Kb/r1B/NwkQMWL Z1kIhna4eJXPVov9q/AebmM5pBc/SOsQhR/YaCtFjdPrPwZNAhC0CXTFPyT2rrsonsVV 7vPw== X-Gm-Message-State: AJcUukd9Cj6oBudhJUg5NAtVhMuQElMk/a0oA+zhlu2UtSjd8O2bW4nm sKZ80kPkGz/PyDt7m5QzG4bE8PnSHDw= X-Google-Smtp-Source: ALg8bN7v31reaIlKFpi6B3V0G+70fL+WdzhVxNhGsbT7wHyjcv/DsVLRJjpJbEZDzFjnZKWyPG7EgA== X-Received: by 2002:a37:93c3:: with SMTP id v186mr34836890qkd.285.1546272480167; Mon, 31 Dec 2018 08:08:00 -0800 (PST) Received: from sprint.hunleth.lan (pool-74-96-77-75.washdc.fios.verizon.net. [74.96.77.75]) by smtp.gmail.com with ESMTPSA id q54sm22607035qtb.64.2018.12.31.08.07.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Dec 2018 08:07:59 -0800 (PST) From: Frank Hunleth To: buildroot@buildroot.org Date: Mon, 31 Dec 2018 11:07:14 -0500 Message-Id: <20181231160714.94082-1-fhunleth@troodon-software.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH v2 1/1] package/php_amqp: fix build with php 7.3.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- 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 -- 2.17.1 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 +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 + +--- + 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 +