From bd5c50a4c800ff9056ba291a10b58bd90aaeb8ae Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 29 Jul 2026 02:20:07 +0000 Subject: [PATCH] tcsh: upgrade 6.24.12 -> 6.24.16 Changes across the 6.24.13 - 6.24.16 maintenance releases: - Handle redirections in bracketed expressions, e.g. if { foo > /dev/null }. - Recognize history searches in history expansion (!?foo). - Fix !^:h and !^:t failing when no / is found. - Add cross-build support for the gethost helper; add support for $?<. - Fix issues with S-JIS handling; improve nls/Makefile.in compatibility hacks. Makefile changed the gethost host-helper rule to use CPPFLAGS_FOR_BUILD / CFLAGS_FOR_BUILD, which lack the -I. -I$(srcdir) include paths, so the configure-generated config.h was invisible and do_compile failed. Set EXTRA_OEMAKE CC_FOR_GETHOST and {CFLAGS,CPPFLAGS,LDFLAGS}_FOR_BUILD from the BUILD_* vars and simplified do_compile:prepend to 'oe_runmake gethost'. The *_FOR_BUILD vars are only consumed by the gethost rule, so the target build is unaffected. Signed-off-by: Khem Raj --- .../tcsh/{tcsh_6.24.12.bb => tcsh_6.24.16.bb} | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) rename meta-oe/recipes-shells/tcsh/{tcsh_6.24.12.bb => tcsh_6.24.16.bb} (66%) diff --git a/meta-oe/recipes-shells/tcsh/tcsh_6.24.12.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.24.16.bb similarity index 66% rename from meta-oe/recipes-shells/tcsh/tcsh_6.24.12.bb rename to meta-oe/recipes-shells/tcsh/tcsh_6.24.16.bb index 058fe6a7c4..86529efb07 100644 --- a/meta-oe/recipes-shells/tcsh/tcsh_6.24.12.bb +++ b/meta-oe/recipes-shells/tcsh/tcsh_6.24.16.bb @@ -13,13 +13,19 @@ SRC_URI = " \ file://0001-Enable-system-malloc-on-all-linux.patch \ file://0002-Add-debian-csh-scripts.patch \ " -SRC_URI[sha256sum] = "e3270ce9667fd5bd2a046687659fcf5fd6a6781326f806ebd724f1e1c9cd4185" +SRC_URI[sha256sum] = "4208cf4630fb64d91d81987f854f9570a5a0e8a001a92827def37d0ed8f37364" -EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" +# tcsh 6.24.16 changed the "gethost" build-host helper rule to use +# CPPFLAGS_FOR_BUILD/CFLAGS_FOR_BUILD/LDFLAGS_FOR_BUILD instead of the target +# CPPFLAGS/CFLAGS/LDFLAGS it used through 6.24.12. Those *_FOR_BUILD flags do +# not carry the "-I. -I$(srcdir)" include paths the target CPPFLAGS had, so the +# generated config.h (in the build dir) is not found. Supply the build-host +# flags, including the include dirs, so gethost compiles with the native gcc. +EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}' CFLAGS_FOR_BUILD='${BUILD_CFLAGS}' CPPFLAGS_FOR_BUILD='-I. -I${S} ${BUILD_CPPFLAGS}' LDFLAGS_FOR_BUILD='${BUILD_LDFLAGS}'" inherit autotools do_compile:prepend() { - oe_runmake CC_FOR_GETHOST='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' LDFLAGS='${BUILD_LDFLAGS}' gethost + oe_runmake gethost } do_install:append () {