From patchwork Thu Dec 19 14:11:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 54354 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 E195DE7718B for ; Thu, 19 Dec 2024 14:12:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.129616.1734617515385744515 for ; Thu, 19 Dec 2024 06:11:55 -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 F14C71762 for ; Thu, 19 Dec 2024 06:12:22 -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 826603F7B4 for ; Thu, 19 Dec 2024 06:11:54 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/7] bash: remove aclocal workarounds Date: Thu, 19 Dec 2024 14:11:45 +0000 Message-ID: <20241219141151.2592031-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 ; Thu, 19 Dec 2024 14:12:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208910 Instead of patching configure.ac to not load m4 directly and working around what aclocal and the autotools class do, just exclude the running of aclocal entirely. This stops the class removing the existing aclocal.m4 and autoreconf running aclocal. Signed-off-by: Ross Burton --- meta/recipes-extended/bash/bash.inc | 8 +-- .../bash/bash/use_aclocal.patch | 69 ------------------- meta/recipes-extended/bash/bash_5.2.37.bb | 1 - 3 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 meta/recipes-extended/bash/bash/use_aclocal.patch diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index 66058feff38..634209c9115 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -7,7 +7,7 @@ DEPENDS = "ncurses bison-native virtual/libiconv" inherit autotools gettext texinfo update-alternatives ptest -EXTRA_AUTORECONF += "--exclude=autoheader" +EXTRA_AUTORECONF += "--exclude=autoheader,aclocal" EXTRA_OECONF = "--enable-job-control --without-bash-malloc bash_cv_wexitstatus_offset=8" # If NON_INTERACTIVE_LOGIN_SHELLS is defined, all login shells read the @@ -46,12 +46,6 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = " \ CACHED_CONFIGUREVARS += "headersdir=${includedir}/${PN}" -do_configure:prepend () { - if [ ! -e ${S}/acinclude.m4 ]; then - cat ${S}/aclocal.m4 > ${S}/acinclude.m4 - fi -} - do_compile:prepend() { # Remove any leftover .build files. This ensures that bash always has the # same version number and keeps builds reproducible diff --git a/meta/recipes-extended/bash/bash/use_aclocal.patch b/meta/recipes-extended/bash/bash/use_aclocal.patch deleted file mode 100644 index e966b037a27..00000000000 --- a/meta/recipes-extended/bash/bash/use_aclocal.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b3a64702fa1978463c01bd5d9fe711e4628aba1e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 28 Dec 2020 21:04:27 +0100 -Subject: [PATCH] bash: update 5.0 -> 5.1 - -Including m4 files directly like this confuses autotools.bbclass, remove -the references and rely upon aclocal to collect the m4 files together -as needed instead making it work like other autotools based projects. - -Upstream-Status: Inappropriate [OE configuration specific] -RP 2021/1/20 ---- - configure.ac | 43 ------------------------------------------- - 1 file changed, 43 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 50a6e20..a3b5bd7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -710,49 +710,6 @@ if test x$SIZE = x; then - fi - AC_SUBST(SIZE) - --m4_include([m4/stat-time.m4]) --m4_include([m4/timespec.m4]) -- --m4_include([m4/strtoimax.m4]) -- --dnl include files for gettext -- --m4_include([m4/codeset.m4]) --m4_include([m4/extern-inline.m4]) --m4_include([m4/fcntl-o.m4]) --m4_include([m4/gettext.m4]) --m4_include([m4/glibc2.m4]) --m4_include([m4/glibc21.m4]) --m4_include([m4/host-cpu-c-abi.m4]) --m4_include([m4/iconv.m4]) --m4_include([m4/intdiv0.m4]) --m4_include([m4/intl.m4]) --m4_include([m4/intlmacosx.m4]) --m4_include([m4/intl-thread-locale.m4]) --m4_include([m4/intmax.m4]) --m4_include([m4/inttypes-pri.m4]) --m4_include([m4/inttypes.m4]) --m4_include([m4/inttypes_h.m4]) --m4_include([m4/lcmessage.m4]) --m4_include([m4/lib-ld.m4]) --m4_include([m4/lib-link.m4]) --m4_include([m4/lib-prefix.m4]) --m4_include([m4/lock.m4]) --m4_include([m4/nls.m4]) --m4_include([m4/po.m4]) --m4_include([m4/printf-posix.m4]) --m4_include([m4/progtest.m4]) --m4_include([m4/pthread_rwlock_rdlock.m4]) --m4_include([m4/size_max.m4]) --m4_include([m4/stdint_h.m4]) --m4_include([m4/threadlib.m4]) --m4_include([m4/uintmax_t.m4]) --m4_include([m4/ulonglong.m4]) --m4_include([m4/visibility.m4]) --m4_include([m4/wchar_t.m4]) --m4_include([m4/wint_t.m4]) --m4_include([m4/xsize.m4]) -- - dnl C compiler characteristics - AC_C_CONST - AC_C_INLINE diff --git a/meta/recipes-extended/bash/bash_5.2.37.bb b/meta/recipes-extended/bash/bash_5.2.37.bb index 3dcaefa374e..20c51ecdbc9 100644 --- a/meta/recipes-extended/bash/bash_5.2.37.bb +++ b/meta/recipes-extended/bash/bash_5.2.37.bb @@ -11,7 +11,6 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ file://run-ptest \ file://run-bash-ptests \ file://fix-run-builtins.patch \ - file://use_aclocal.patch \ file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ file://fix-filesubst-errexit.patch \ " From patchwork Thu Dec 19 14:11:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 54355 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 1266BE7718F for ; Thu, 19 Dec 2024 14:12:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.129765.1734617516011481120 for ; Thu, 19 Dec 2024 06:11:56 -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 A10F61762 for ; Thu, 19 Dec 2024 06:12:23 -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 2A4343F7B4 for ; Thu, 19 Dec 2024 06:11:55 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/7] subversion: add explicit DEPENDS on expat Date: Thu, 19 Dec 2024 14:11:46 +0000 Message-ID: <20241219141151.2592031-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241219141151.2592031-1-ross.burton@arm.com> References: <20241219141151.2592031-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 ; Thu, 19 Dec 2024 14:12:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208911 The configure script looks explicitly for expat, so add it to DEPENDS. Signed-off-by: Ross Burton --- meta/recipes-devtools/subversion/subversion_1.14.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/subversion/subversion_1.14.5.bb b/meta/recipes-devtools/subversion/subversion_1.14.5.bb index c8a2e12f4f0..b1347906204 100644 --- a/meta/recipes-devtools/subversion/subversion_1.14.5.bb +++ b/meta/recipes-devtools/subversion/subversion_1.14.5.bb @@ -5,7 +5,7 @@ SECTION = "console/network" LICENSE = "Apache-2.0 & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6487ae7094d359fa90fb9c4096e52e2b" -DEPENDS = "apr-util serf sqlite3 file lz4" +DEPENDS = "apr-util serf sqlite3 file lz4 expat" DEPENDS:append:class-native = " file-replacement-native" SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ From patchwork Thu Dec 19 14:11:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 54356 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 0A25FE7718D for ; Thu, 19 Dec 2024 14:12:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.129766.1734617516659195757 for ; Thu, 19 Dec 2024 06:11:56 -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 487C11762 for ; Thu, 19 Dec 2024 06:12:24 -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 CF8743F7B4 for ; Thu, 19 Dec 2024 06:11:55 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/7] subversion: refactor do_configure Date: Thu, 19 Dec 2024 14:11:47 +0000 Message-ID: <20241219141151.2592031-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241219141151.2592031-1-ross.burton@arm.com> References: <20241219141151.2592031-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 ; Thu, 19 Dec 2024 14:12:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208912 Upstream has an autogen.sh which constructs a hand-written aclocal.m4 and manually copies libtool into place. Instead of working around the bad interaction between these expectations and our autotools class we can just disable the execution of aclocal in autoreconf and copy files as autogen.sh does. Signed-off-by: Ross Burton --- .../subversion/subversion_1.14.5.bb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/subversion/subversion_1.14.5.bb b/meta/recipes-devtools/subversion/subversion_1.14.5.bb index b1347906204..56ef1019fc4 100644 --- a/meta/recipes-devtools/subversion/subversion_1.14.5.bb +++ b/meta/recipes-devtools/subversion/subversion_1.14.5.bb @@ -35,18 +35,19 @@ EXTRA_OECONF = " \ ac_cv_path_RUBY=none \ " +# Upstream puts the .pc in $datadir EXTRA_OEMAKE += "pkgconfig_dir=${libdir}/pkgconfig" -acpaths = "-I build/ -I build/ac-macros/" - CPPFLAGS += "-P" BUILD_CPPFLAGS += "-P" +EXTRA_AUTORECONF += "--exclude=aclocal" + do_configure:prepend () { - rm -f ${S}/libtool - rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4 ${S}/build/lt~obsolete.m4 - rm -f ${S}/aclocal.m4 - sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4 + # autogen.sh manually puts things in the right place, and libtoolize doesn't + # work as they don't use aclocal + cp -f ${S}/aclocal.m4.in ${S}/aclocal.m4 + cp -f ${STAGING_DATADIR}/aclocal/libtool.m4 ${STAGING_DATADIR}/aclocal/lt*.m4 ${S}/build/ } #| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_local/libsvn_ra_local-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_repos/libsvn_repos-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| /usr/bin/ld: cannot find -lsvn_delta-1| collect2: ld returned 1 exit status| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_svn/libsvn_ra_svn-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_serf/libsvn_ra_serf-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib' From patchwork Thu Dec 19 14:11:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 54350 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 DB3E8E7718A for ; Thu, 19 Dec 2024 14:12:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.129617.1734617517231799601 for ; Thu, 19 Dec 2024 06:11:57 -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 ECF801D13 for ; Thu, 19 Dec 2024 06:12:24 -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 76B233F7B4 for ; Thu, 19 Dec 2024 06:11:56 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/7] tcl: don't run aclocal in do_configure Date: Thu, 19 Dec 2024 14:11:48 +0000 Message-ID: <20241219141151.2592031-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241219141151.2592031-1-ross.burton@arm.com> References: <20241219141151.2592031-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 ; Thu, 19 Dec 2024 14:12:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208913 tcl has a hand-maintained aclocal.m4 so don't run aclocal, which has the side effect of not deleting the aclocal.m4 file which pulls in macros. The build works without this change more through luck and a combination of behaviours than design. Signed-off-by: Ross Burton --- meta/recipes-devtools/tcltk/tcl_9.0.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/tcltk/tcl_9.0.0.bb b/meta/recipes-devtools/tcltk/tcl_9.0.0.bb index 46e8e7d5c52..b67847c5260 100644 --- a/meta/recipes-devtools/tcltk/tcl_9.0.0.bb +++ b/meta/recipes-devtools/tcltk/tcl_9.0.0.bb @@ -35,6 +35,8 @@ VER = "${PV}" inherit autotools ptest binconfig AUTOTOOLS_SCRIPT_PATH = "${S}/unix" +EXTRA_AUTORECONF = "--exclude=aclocal" + EXTRA_OECONF = "--disable-rpath --enable-man-suffix=tcl9" # Prevent installing copy of tzdata based on tzdata installation on the build host From patchwork Thu Dec 19 14:11:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 54353 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 EAEB6E7718C for ; Thu, 19 Dec 2024 14:12:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.129618.1734617517817142759 for ; Thu, 19 Dec 2024 06:11:57 -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 9D1CB1762 for ; Thu, 19 Dec 2024 06:12:25 -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 2730D3F7B4 for ; Thu, 19 Dec 2024 06:11:57 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/7] tcl8: don't run aclocal in do_configure Date: Thu, 19 Dec 2024 14:11:49 +0000 Message-ID: <20241219141151.2592031-5-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241219141151.2592031-1-ross.burton@arm.com> References: <20241219141151.2592031-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 ; Thu, 19 Dec 2024 14:12:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208914 tcl has a hand-maintained aclocal.m4 so don't run aclocal, which has the side effect of not deleting the aclocal.m4 file which pulls in macros. The build works without this change more through luck and a combination of behaviours than design. Signed-off-by: Ross Burton --- meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb b/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb index 928124148ce..b13102dd7af 100644 --- a/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb +++ b/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb @@ -38,6 +38,8 @@ VER = "${PV}" inherit autotools ptest binconfig AUTOTOOLS_SCRIPT_PATH = "${S}/unix" +EXTRA_AUTORECONF = "--exclude=aclocal" + EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix=tcl8" # Prevent installing copy of tzdata based on tzdata installation on the build host From patchwork Thu Dec 19 14:11:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 54352 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 F2E3BE7718E for ; Thu, 19 Dec 2024 14:12:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.129620.1734617518656757633 for ; Thu, 19 Dec 2024 06:11:58 -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 4CF311762 for ; Thu, 19 Dec 2024 06:12:26 -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 CB1E53F7B4 for ; Thu, 19 Dec 2024 06:11:57 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 6/7] expect: don't run aclocal in do_configure Date: Thu, 19 Dec 2024 14:11:50 +0000 Message-ID: <20241219141151.2592031-6-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241219141151.2592031-1-ross.burton@arm.com> References: <20241219141151.2592031-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 ; Thu, 19 Dec 2024 14:12:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208915 expect has a hand-maintained aclocal.m4 so don't run aclocal, which has the side effect of not deleting the aclocal.m4 file which pulls in macros. The build works without this change more through luck and a combination of behaviours than design. Signed-off-by: Ross Burton --- meta/recipes-devtools/expect/expect_5.45.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb index 3d50a8f25a1..3886a5771a2 100644 --- a/meta/recipes-devtools/expect/expect_5.45.4.bb +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb @@ -39,6 +39,8 @@ UPSTREAM_CHECK_REGEX = "/Expect/(?P(\d+[\.\-_]*)+)/" S = "${WORKDIR}/${BPN}${PV}" +EXTRA_AUTORECONF += "--exclude=aclocal" + do_install:append() { install -d ${D}${libdir} install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so ${D}${libdir}/ From patchwork Thu Dec 19 14:11:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 54351 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 E2A96E77184 for ; Thu, 19 Dec 2024 14:12:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.129767.1734617519127340701 for ; Thu, 19 Dec 2024 06:11:59 -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 E82981D13 for ; Thu, 19 Dec 2024 06:12:26 -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 7B16D3F7B4 for ; Thu, 19 Dec 2024 06:11:58 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 7/7] expect: cleanup do_install Date: Thu, 19 Dec 2024 14:11:51 +0000 Message-ID: <20241219141151.2592031-7-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241219141151.2592031-1-ross.burton@arm.com> References: <20241219141151.2592031-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 ; Thu, 19 Dec 2024 14:12:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208916 Clean up the do_install append, and remove a long-standing unused variable that appears to be intending to not install the scripts but would have never actually done that as the relevant override since 2008 has been task-install. As we've been installing the scripts, keep instaling them. Signed-off-by: Ross Burton --- meta/recipes-devtools/expect/expect_5.45.4.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb index 3886a5771a2..93ecc3f0d69 100644 --- a/meta/recipes-devtools/expect/expect_5.45.4.bb +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb @@ -42,11 +42,9 @@ S = "${WORKDIR}/${BPN}${PV}" EXTRA_AUTORECONF += "--exclude=aclocal" do_install:append() { - install -d ${D}${libdir} - install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so ${D}${libdir}/ - install -m 0755 ${S}/fixline1 ${D}${libdir}/expect${PV}/ - rm ${D}${libdir}/expect${PV}/libexpect*.so - sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl + mv ${D}${libdir}/expect${PV}/libexpect*.so ${D}${libdir}/ + install -m 0755 ${S}/fixline1 ${D}${libdir}/expect${PV}/ + sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl } do_install_ptest() { @@ -65,7 +63,6 @@ EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \ --disable-rpath \ ${TCL_INCLUDE_PATH} \ " -EXTRA_OEMAKE_install = " 'SCRIPTS=' " ALTERNATIVE:${PN} = "mkpasswd" ALTERNATIVE_LINK_NAME[mkpasswd] = "${bindir}/mkpasswd"