From patchwork Wed Jan 8 15:46:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 55230 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 5E273E77188 for ; Wed, 8 Jan 2025 15:46:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.22870.1736351201607070530 for ; Wed, 08 Jan 2025 07:46:41 -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 57D1513D5 for ; Wed, 8 Jan 2025 07:47:09 -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 B54EB3F66E for ; Wed, 8 Jan 2025 07:46:40 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/4] rsync: clean up configure/configure.sh fiddling Date: Wed, 8 Jan 2025 15:46:33 +0000 Message-ID: <20250108154636.1431857-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 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 ; Wed, 08 Jan 2025 15:46:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209569 The upstream Makefiles tell autoconf to write the generated script to configure.sh instead of the idiomatic configure. We now remove all of the Makefile rules that refer to configure.sh (makefile-no-rebuild.patch) but some pieces remained, so remove them too and delete the existing configure.sh to avoid confusion for anyone looking at the build treee. Also add a comment explaining why autotools-brokensep is used. Signed-off-by: Ross Burton --- meta/recipes-devtools/rsync/rsync_3.3.0.bb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/meta/recipes-devtools/rsync/rsync_3.3.0.bb b/meta/recipes-devtools/rsync/rsync_3.3.0.bb index a90d2887bd5..c03bb270d41 100644 --- a/meta/recipes-devtools/rsync/rsync_3.3.0.bb +++ b/meta/recipes-devtools/rsync/rsync_3.3.0.bb @@ -18,6 +18,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ " SRC_URI[sha256sum] = "7399e9a6708c32d678a72a63219e96f23be0be2336e50fd1348498d07041df90" +# Doesn't use automake inherit autotools-brokensep PACKAGECONFIG ??= "acl attr \ @@ -49,14 +50,10 @@ EXTRA_OECONF = "--disable-md2man --with-nobody-group=nogroup" #| If you can't fix the issue, re-run ./configure with --disable-roll-simd. EXTRA_OECONF:append:libc-musl = " --disable-roll-simd" -# rsync 3.0 uses configure.sh instead of configure, and -# makefile checks the existence of configure.sh +# rsync uses configure.sh instead of configure, so delete that file +# to avoid confusion as we will generate configure. do_configure:prepend () { - rm -f ${S}/configure ${S}/configure.sh -} - -do_configure:append () { - cp -f ${S}/configure ${S}/configure.sh + rm -f ${S}/configure.sh } do_install:append() { From patchwork Wed Jan 8 15:46:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 55233 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 41199E77188 for ; Wed, 8 Jan 2025 15:46:52 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.22871.1736351202208580438 for ; Wed, 08 Jan 2025 07:46:42 -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 F2BAE13D5 for ; Wed, 8 Jan 2025 07:47:09 -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 5CD703F66E for ; Wed, 8 Jan 2025 07:46:41 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] libtheora: backport a patch to fix autoreconf Date: Wed, 8 Jan 2025 15:46:34 +0000 Message-ID: <20250108154636.1431857-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250108154636.1431857-1-ross.burton@arm.com> References: <20250108154636.1431857-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 ; Wed, 08 Jan 2025 15:46:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209570 This is needed so that autoreconf works without any macro path fiddling, which autotools may no longer be doing implicitly. Signed-off-by: Ross Burton --- .../libtheora-1.1.1/autoreconf.patch | 42 +++++++++++++++++++ .../libtheora/libtheora_1.1.1.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta/recipes-multimedia/libtheora/libtheora-1.1.1/autoreconf.patch diff --git a/meta/recipes-multimedia/libtheora/libtheora-1.1.1/autoreconf.patch b/meta/recipes-multimedia/libtheora/libtheora-1.1.1/autoreconf.patch new file mode 100644 index 00000000000..0fc09ba413c --- /dev/null +++ b/meta/recipes-multimedia/libtheora/libtheora-1.1.1/autoreconf.patch @@ -0,0 +1,42 @@ +From 859e58b440e64aeec446ae0a923a638e4203f408 Mon Sep 17 00:00:00 2001 +From: Tim Terriberry +Date: Fri, 20 May 2011 20:41:50 +0000 +Subject: [PATCH] Make autoreconf -i -f work. + +Patch from David Schleef. + +svn path=/trunk/theora/; revision=17990 + +Upstream-Status: Backport +Signed-off-by: Ross Burton +--- + Makefile.am | 2 ++ + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index d833491..369978d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,8 @@ + + AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2 + ++ACLOCAL_AMFLAGS=-I m4 ++ + if THEORA_ENABLE_EXAMPLES + EXAMPLES_DIR = examples + else +diff --git a/configure.ac b/configure.ac +index 8260bdf..d4feb86 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -61,7 +61,7 @@ AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + + dnl Add parameters for aclocal +-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") ++AC_CONFIG_MACRO_DIR([m4]) + + dnl Check for doxygen + AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false) diff --git a/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb b/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb index 11674af379f..f3d053d9f47 100644 --- a/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb +++ b/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb @@ -9,6 +9,7 @@ DEPENDS = "libogg" SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-${PV}.tar.bz2 \ + file://autoreconf.patch \ file://no-docs.patch" SRC_URI[md5sum] = "292ab65cedd5021d6b7ddd117e07cd8e" From patchwork Wed Jan 8 15:46:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 55231 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 44A82E7719A for ; Wed, 8 Jan 2025 15:46:52 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.22872.1736351202764916721 for ; Wed, 08 Jan 2025 07:46:42 -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 A1CD213D5 for ; Wed, 8 Jan 2025 07:47:10 -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 046CD3F66E for ; Wed, 8 Jan 2025 07:46:41 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] autotools: log when we're removing aclocal.m4 Date: Wed, 8 Jan 2025 15:46:35 +0000 Message-ID: <20250108154636.1431857-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250108154636.1431857-1-ross.burton@arm.com> References: <20250108154636.1431857-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 ; Wed, 08 Jan 2025 15:46:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209571 Some mysterious autotools errors are because upstream has a custom aclocal.m4 that we're deleting it unless we know we're not even running aclocal. There's a case to be made for removing this deletion logic on the grounds that aclocal should know what it is doing, but for now make it clear that we're deleting a file by saying so in the task log. Signed-off-by: Ross Burton --- meta/classes-recipe/autotools.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass index a1d8e4b3603..9e89ce40b9e 100644 --- a/meta/classes-recipe/autotools.bbclass +++ b/meta/classes-recipe/autotools.bbclass @@ -193,6 +193,7 @@ autotools_do_configure() { # like it was auto-generated. Work around this by blowing it away # by hand, unless the package specifically asked not to run aclocal. if ! echo ${EXTRA_AUTORECONF} | grep -q "aclocal"; then + bbnote Removing existing aclocal.m4 rm -f aclocal.m4 fi if [ -e configure.in ]; then From patchwork Wed Jan 8 15:46:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 55232 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 45BC5E7719C for ; Wed, 8 Jan 2025 15:46:52 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.22345.1736351203334160641 for ; Wed, 08 Jan 2025 07:46:43 -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 4AD3713D5 for ; Wed, 8 Jan 2025 07:47:11 -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 A92E13F66E for ; Wed, 8 Jan 2025 07:46:42 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/4] autotools: remove aclocal --automake-acdir, relocated so knows the right path Date: Wed, 8 Jan 2025 15:46:36 +0000 Message-ID: <20250108154636.1431857-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250108154636.1431857-1-ross.burton@arm.com> References: <20250108154636.1431857-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 ; Wed, 08 Jan 2025 15:46:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209572 A relocated aclocal in the native sysroot has the right paths already: $ cat /work/ross/build/tmp/work/cortexa57-poky-linux/expect/5.45.4/recipe-sysroot-native/usr/bin/aclocal my @automake_includes = ('/work/ross/build/tmp/work/cortexa57-poky-linux/expect/5.45.4/recipe-sysroot-native/usr/share/aclocal-' . $APIVERSION); Thus there is no need to tell aclocal the path explicitly. Signed-off-by: Ross Burton --- meta/classes-recipe/autotools.bbclass | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass index 9e89ce40b9e..4e7bf6696d7 100644 --- a/meta/classes-recipe/autotools.bbclass +++ b/meta/classes-recipe/autotools.bbclass @@ -183,12 +183,6 @@ autotools_do_configure() { acpaths="${acpaths}" fi acpaths="$acpaths ${ACLOCALEXTRAPATH}" - AUTOV=`automake --version | sed -e '1{s/.* //;s/\.[0-9]\+$//};q'` - automake --version - echo "AUTOV is $AUTOV" - if [ -d ${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV ]; then - ACLOCAL="$ACLOCAL --automake-acdir=${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV" - fi # autoreconf is too shy to overwrite aclocal.m4 if it doesn't look # like it was auto-generated. Work around this by blowing it away # by hand, unless the package specifically asked not to run aclocal.