From patchwork Fri Jan 24 14:33:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 56051 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3D06C0218B for ; Fri, 24 Jan 2025 14:34:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.13341.1737729246972195874 for ; Fri, 24 Jan 2025 06:34:07 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6D27F497 for ; Fri, 24 Jan 2025 06:34:34 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2A7683F694 for ; Fri, 24 Jan 2025 06:34:06 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 2/4] php: cleanup autoconf fettling Date: Fri, 24 Jan 2025 14:33:59 +0000 Message-ID: <20250124143401.1635224-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250124143401.1635224-1-ross.burton@arm.com> References: <20250124143401.1635224-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 24 Jan 2025 14:34:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115063 This autoconf manipulation is very old and appears to be obsolete now. Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/php/php_8.2.26.bb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta-oe/recipes-devtools/php/php_8.2.26.bb b/meta-oe/recipes-devtools/php/php_8.2.26.bb index f5e57ab36a..f2363c8e54 100644 --- a/meta-oe/recipes-devtools/php/php_8.2.26.bb +++ b/meta-oe/recipes-devtools/php/php_8.2.26.bb @@ -136,10 +136,7 @@ LDFLAGS:append:riscv64 = " -latomic" EXTRA_OEMAKE = "INSTALL_ROOT=${D}" -acpaths = "" - do_configure:prepend () { - rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4 find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!' } @@ -162,11 +159,6 @@ do_install:append:class-native() { rm -rf ${D}/${PHP_LIBDIR}/php/.[a-z]* } -do_install:prepend() { - cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \ - ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4 -} - do_install:prepend:class-target() { if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then # Install dummy config file so apxs doesn't fail