From patchwork Sat Jun 11 13:18:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1642428 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LKz1r4C5gz9sFr for ; Sat, 11 Jun 2022 23:19:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5ED1D4259C; Sat, 11 Jun 2022 13:19:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id myj_UrbuHZ7I; Sat, 11 Jun 2022 13:19:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id EC87F42590; Sat, 11 Jun 2022 13:19:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id F37E51BF2A5 for ; Sat, 11 Jun 2022 13:18:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EFE0B411F4 for ; Sat, 11 Jun 2022 13:18:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K-JkfFL7hIDs for ; Sat, 11 Jun 2022 13:18:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by smtp2.osuosl.org (Postfix) with ESMTPS id E7AAE404F0 for ; Sat, 11 Jun 2022 13:18:53 +0000 (UTC) Received: from fwd85.dcpf.telekom.de (fwd85.aul.t-online.de [10.223.144.111]) by mailout06.t-online.de (Postfix) with SMTP id CC3101A153 for ; Sat, 11 Jun 2022 15:18:51 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.12.97]) by fwd85.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1o010n-0moBE10; Sat, 11 Jun 2022 15:18:45 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:54090) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1o010n-00061G-29 for buildroot@buildroot.org; Sat, 11 Jun 2022 15:18:45 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 11 Jun 2022 15:18:42 +0200 Message-Id: <20220611131845.2605483-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1654953525-01421A9A-1A569202/0/0 CLEAN NORMAL X-TOI-MSGID: bd8fa212-9701-44a4-9137-e43bd4201b5f Subject: [Buildroot] [PATCH 1/4] package/php: remove wddx extension X-BeenThere: buildroot@buildroot.org 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: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Upstream removed the wddx extension with version 7.4: https://github.com/php/php-src/commit/6bbb18a0b6bef11222caaa55c00abdbcbb55d54b and moved it to pecl: https://pecl.php.net/package/wddx The pecl package is unmaintained however so we do not add it as a new package to buildroot. Signed-off-by: Bernd Kuhls --- Config.in.legacy | 8 ++++++++ package/php/Config.ext | 7 ------- package/php/php.mk | 5 ----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 853a8917be..9d7bdfab10 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,14 @@ endif ############################################################################### +comment "Legacy options removed in 2022.08" + +config BR2_PACKAGE_PHP_EXT_WDDX + bool "php wddx removed" + select BR2_LEGACY + help + The WDDX extension was removed from php. + comment "Legacy options removed in 2022.05" config BR2_PACKAGE_KTAP diff --git a/package/php/Config.ext b/package/php/Config.ext index 1c2af9fd15..d5f8659016 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -385,13 +385,6 @@ config BR2_PACKAGE_PHP_EXT_SIMPLEXML help SimpleXML support -config BR2_PACKAGE_PHP_EXT_WDDX - bool "WDDX" - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_PHP_EXT_LIBXML2 - help - WDDX support - config BR2_PACKAGE_PHP_EXT_XML bool "XML Parser" select BR2_PACKAGE_PHP_EXT_LIBXML2 diff --git a/package/php/php.mk b/package/php/php.mk index f649a9bb8b..39db9d3a7c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -150,11 +150,6 @@ PHP_CONF_OPTS += --with-libxml PHP_DEPENDENCIES += libxml2 endif -ifeq ($(BR2_PACKAGE_PHP_EXT_WDDX),y) -PHP_CONF_OPTS += --enable-wddx --with-libexpat-dir=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += expat -endif - ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y) PHP_DEPENDENCIES += libzip endif From patchwork Sat Jun 11 13:18:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1642427 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LKz1c0cK2z9sGP for ; Sat, 11 Jun 2022 23:18:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 37C5B42591; Sat, 11 Jun 2022 13:18:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eSwwSkUSd8TE; Sat, 11 Jun 2022 13:18:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 643C142588; Sat, 11 Jun 2022 13:18:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id A30241BF2A5 for ; Sat, 11 Jun 2022 13:18:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 9FB3F42588 for ; Sat, 11 Jun 2022 13:18:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HMpQ2xNMm1Cy for ; Sat, 11 Jun 2022 13:18:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout11.t-online.de (mailout11.t-online.de [194.25.134.85]) by smtp4.osuosl.org (Postfix) with ESMTPS id 216E2419CD for ; Sat, 11 Jun 2022 13:18:50 +0000 (UTC) Received: from fwd87.dcpf.telekom.de (fwd87.aul.t-online.de [10.223.144.113]) by mailout11.t-online.de (Postfix) with SMTP id 3057F9311 for ; Sat, 11 Jun 2022 15:18:48 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.12.97]) by fwd87.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1o010n-2En1ST0; Sat, 11 Jun 2022 15:18:45 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:54090) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1o010n-00061G-47 for buildroot@buildroot.org; Sat, 11 Jun 2022 15:18:45 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 11 Jun 2022 15:18:43 +0200 Message-Id: <20220611131845.2605483-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220611131845.2605483-1-bernd.kuhls@t-online.de> References: <20220611131845.2605483-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1654953525-0142618F-631C5A98/0/0 CLEAN NORMAL X-TOI-MSGID: e90cb257-29df-485c-9f31-381c99f26fa2 Subject: [Buildroot] [PATCH 2/4] package/php: simplify icu configure options X-BeenThere: buildroot@buildroot.org 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: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Since php-7.4 upstream switched to pkg-config to detect icu: https://github.com/php/php-src/commit/20fa2e7b58c519cc148d9658456b695884b1ecf4 Remove all unneeded code from php.mk. Signed-off-by: Bernd Kuhls --- package/php/php.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package/php/php.mk b/package/php/php.mk index 39db9d3a7c..d9c2edd839 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -176,13 +176,8 @@ endif endif ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y) -PHP_CONF_OPTS += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr -PHP_CXXFLAGS += "`$(STAGING_DIR)/usr/bin/icu-config --cxxflags`" +PHP_CONF_OPTS += --enable-intl PHP_DEPENDENCIES += icu -# The intl module is implemented in C++, but PHP fails to use -# g++ as the compiler for the final link. As a workaround, -# tell it to link libstdc++. -PHP_EXTRA_LIBS += -lstdc++ endif ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y) From patchwork Sat Jun 11 13:18:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1642430 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LKz2N2Tm7z9sFr for ; Sat, 11 Jun 2022 23:19:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C5A17842DD; Sat, 11 Jun 2022 13:19:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7EgiS6Iu3iuW; Sat, 11 Jun 2022 13:19:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id C4A6C842DB; Sat, 11 Jun 2022 13:19:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id F04C31BF2A5 for ; Sat, 11 Jun 2022 13:18:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E001D4258E for ; Sat, 11 Jun 2022 13:18:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DSGZh902lehu for ; Sat, 11 Jun 2022 13:18:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by smtp4.osuosl.org (Postfix) with ESMTPS id AF86042588 for ; Sat, 11 Jun 2022 13:18:57 +0000 (UTC) Received: from fwd76.dcpf.telekom.de (fwd76.aul.t-online.de [10.223.144.102]) by mailout07.t-online.de (Postfix) with SMTP id 8ACDA33A for ; Sat, 11 Jun 2022 15:18:55 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.12.97]) by fwd76.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1o010n-0co5wH0; Sat, 11 Jun 2022 15:18:45 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:54090) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1o010n-00061G-5c for buildroot@buildroot.org; Sat, 11 Jun 2022 15:18:45 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 11 Jun 2022 15:18:44 +0200 Message-Id: <20220611131845.2605483-3-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220611131845.2605483-1-bernd.kuhls@t-online.de> References: <20220611131845.2605483-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1654953525-014331F7-5A702EDD/0/0 CLEAN NORMAL X-TOI-MSGID: c796603e-58e3-468a-9ad1-f3e3795af6bc Subject: [Buildroot] [PATCH 3/4] package/php-yaml: bump version to 2.2.2 X-BeenThere: buildroot@buildroot.org 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: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Changelog: http://pecl.php.net/package-changelog.php?package=yaml&release=2.2.2 Needed to bump php to 8.1.x. Signed-off-by: Bernd Kuhls --- package/php-yaml/php-yaml.hash | 2 +- package/php-yaml/php-yaml.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php-yaml/php-yaml.hash b/package/php-yaml/php-yaml.hash index e4f31cdad9..b4d14c5a30 100644 --- a/package/php-yaml/php-yaml.hash +++ b/package/php-yaml/php-yaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e17ad04e752e25fd099bddd2df9d26dfef183c8d00c4179bc9d7a2e1c97d7819 yaml-2.2.1.tgz +sha256 119052f0461d57d86f44c252f9c9b2dd743486c701c1a0aba0aebecdd0d8b82a yaml-2.2.2.tgz sha256 68d9700294396c72089bfc7bf38a5b3654a53ae415f3bd37768848c14e86f338 LICENSE diff --git a/package/php-yaml/php-yaml.mk b/package/php-yaml/php-yaml.mk index ba16c9ac62..39a422e25d 100644 --- a/package/php-yaml/php-yaml.mk +++ b/package/php-yaml/php-yaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_YAML_VERSION = 2.2.1 +PHP_YAML_VERSION = 2.2.2 PHP_YAML_SOURCE = yaml-$(PHP_YAML_VERSION).tgz PHP_YAML_SITE = https://pecl.php.net/get PHP_YAML_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ From patchwork Sat Jun 11 13:18:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1642429 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LKz254Z4Nz9sFr for ; Sat, 11 Jun 2022 23:19:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 34BF342590; Sat, 11 Jun 2022 13:19:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jp4Rc-IFmtOU; Sat, 11 Jun 2022 13:19:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id BDEF24259B; Sat, 11 Jun 2022 13:19:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 4FBBF1BF2A5 for ; Sat, 11 Jun 2022 13:18:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 3EA7D404F0 for ; Sat, 11 Jun 2022 13:18:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WrAZQWFilWtS for ; Sat, 11 Jun 2022 13:18:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by smtp2.osuosl.org (Postfix) with ESMTPS id F2BBA40A8D for ; Sat, 11 Jun 2022 13:18:53 +0000 (UTC) Received: from fwd85.dcpf.telekom.de (fwd85.aul.t-online.de [10.223.144.111]) by mailout09.t-online.de (Postfix) with SMTP id CC78412EED for ; Sat, 11 Jun 2022 15:18:51 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.12.97]) by fwd85.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1o010n-0moBE20; Sat, 11 Jun 2022 15:18:45 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:54090) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1o010n-00061G-7H for buildroot@buildroot.org; Sat, 11 Jun 2022 15:18:45 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 11 Jun 2022 15:18:45 +0200 Message-Id: <20220611131845.2605483-4-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220611131845.2605483-1-bernd.kuhls@t-online.de> References: <20220611131845.2605483-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1654953525-01421A9A-D13FFF7F/0/0 CLEAN NORMAL X-TOI-MSGID: beb723af-e04b-4651-917d-ffbea65b9d07 Subject: [Buildroot] [PATCH 4/4] package/php: bump version to 8.1.7 X-BeenThere: buildroot@buildroot.org 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: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Rebased patches when needed. Signed-off-by: Bernd Kuhls --- package/php/0001-acinclude.m4-don-t-unset-variables.patch | 6 ++++-- package/php/0002-iconv-tweak-iconv-detection.patch | 4 ++-- package/php/0003-configure-disable-the-phar-tool.patch | 4 ++-- package/php/0005-allow-opcache-cross-compiling.patch | 6 ++++-- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/package/php/0001-acinclude.m4-don-t-unset-variables.patch b/package/php/0001-acinclude.m4-don-t-unset-variables.patch index 2d15552783..9badbd1cc2 100644 --- a/package/php/0001-acinclude.m4-don-t-unset-variables.patch +++ b/package/php/0001-acinclude.m4-don-t-unset-variables.patch @@ -9,6 +9,8 @@ Terminate them with extreme prejudice. Signed-off-by: Gustavo Zacarias Signed-off-by: Adam Duskett [aduskett@gmail.com: Update for 7.3.0] +Signed-off-by: Bernd Kuhls +[Bernd: rebased for 8.1.7] --- build/php.m4 | 4 ---- 1 file changed, 4 deletions(-) @@ -17,7 +19,7 @@ diff --git a/build/php.m4 b/build/php.m4 index e91ef988..9586c490 100644 --- a/build/php.m4 +++ b/build/php.m4 -@@ -1568,8 +1568,6 @@ dnl PHP_CHECK_FUNC_LIB +@@ -1580,8 +1580,6 @@ dnl PHP_CHECK_FUNC_LIB dnl AC_DEFUN([PHP_CHECK_FUNC_LIB],[ ifelse($2,,:,[ @@ -26,7 +28,7 @@ index e91ef988..9586c490 100644 unset found AC_CHECK_LIB($2, $1, [found=yes], [ AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) -@@ -1601,8 +1599,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and +@@ -1616,8 +1616,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and dnl HAVE_library if found and adds the library to LIBS. dnl AC_DEFUN([PHP_CHECK_FUNC],[ diff --git a/package/php/0002-iconv-tweak-iconv-detection.patch b/package/php/0002-iconv-tweak-iconv-detection.patch index 19d7ab5cf9..758dd6133b 100644 --- a/package/php/0002-iconv-tweak-iconv-detection.patch +++ b/package/php/0002-iconv-tweak-iconv-detection.patch @@ -16,7 +16,7 @@ Signed-off-by: Gustavo Zacarias Signed-off-by: Adam Duskett [aduskett@gmail.com: Update for 8.0.7] Signed-off-by: Bernd Kuhls -[Bernd: rebased for 7.4.10 & 7.4.13] +[Bernd: rebased for 7.4.10, 7.4.13 & 8.1.7] --- build/php.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -25,7 +25,7 @@ diff --git a/build/php.m4 b/build/php.m4 index 9586c490..8b3d47ed 100644 --- a/build/php.m4 +++ b/build/php.m4 -@@ -1937,7 +1937,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ +@@ -1976,7 +1976,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ dnl Check external libs for iconv funcs. if test "$found_iconv" = "no"; then diff --git a/package/php/0003-configure-disable-the-phar-tool.patch b/package/php/0003-configure-disable-the-phar-tool.patch index cc4f55a8c8..ab3aecdaa3 100644 --- a/package/php/0003-configure-disable-the-phar-tool.patch +++ b/package/php/0003-configure-disable-the-phar-tool.patch @@ -13,7 +13,7 @@ Signed-off-by: Gustavo Zacarias Signed-off-by: Adam Duskett [Aduskett: update for 8.0.7] Signed-off-by: Bernd Kuhls -[Bernd: rebased for 7.4.10 & 7.4.13] +[Bernd: rebased for 7.4.10, 7.4.13 & 8.1.7] --- configure.ac | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) @@ -22,7 +22,7 @@ diff --git a/configure.ac b/configure.ac index 0dfab302..6026fb66 100644 --- a/configure.ac +++ b/configure.ac -@@ -1423,13 +1423,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" +@@ -1566,13 +1566,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" diff --git a/package/php/0005-allow-opcache-cross-compiling.patch b/package/php/0005-allow-opcache-cross-compiling.patch index d168f71892..f9bc8b3ef5 100644 --- a/package/php/0005-allow-opcache-cross-compiling.patch +++ b/package/php/0005-allow-opcache-cross-compiling.patch @@ -13,6 +13,8 @@ CFLAGS when opcache is enabled: -DHAVE_SHM_MMAP_FILE Signed-off-by: Adam Duskett +Signed-off-by: Bernd Kuhls +[Bernd: rebased for 8.1.7] --- ext/opcache/config.m4 | 4 ---- 1 file changed, 4 deletions(-) @@ -21,8 +23,8 @@ diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index 5492fd92..10c150ff 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 -@@ -339,10 +339,6 @@ int main() { - PHP_ADD_BUILD_DIR([$ext_builddir/Optimizer], 1) +@@ -331,10 +331,6 @@ int main() { + PHP_ADD_EXTENSION_DEP(opcache, pcre) - if test "$have_shm_ipc" != "yes" && test "$have_shm_mmap_posix" != "yes" && test "$have_shm_mmap_anon" != "yes"; then diff --git a/package/php/php.hash b/package/php/php.hash index 2e9aa6880b..996a0152a8 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 973fec765336ee01f47536a5db1c2eee98df9d34a41522b7b6c760159bf0a77b php-8.0.20.tar.xz +sha256 f042322f1b5a9f7c2decb84b7086ef676896c2f7178739b9672afafa964ed0e5 php-8.1.7.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index d9c2edd839..2bcc3fcfc3 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.20 +PHP_VERSION = 8.1.7 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES