From 4170afa998c2cc4531bba7abae39b04d5c265830 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 15 Jul 2024 16:26:14 +0200 Subject: [PATCH] package/tar: properly handle autoreconf Commit 9a66711be1786b90f94cbb1648fa470def3486f8 ("package/tar: fix linking with libiconv") added two patches that patch Makefile.am files, but it forgot to add TAR_AUTORECONF = YES. However, a gotcha is that TAR_AUTORECONF = YES would apply to both the target tar, but also the host tar. But for host-tar, we can't accept to do an autoreconf, because this would cause host-tar to have a dependency on host-{autoconf,automake,libtool}, which in turn would have a dependency on host-tar. Since anyway the patches 0002/0003 that modify Makefile.am are only useful to fix a libiconv problem that occurs when building target tar, we disable autoreconf for host-tar, and we prevent automatic autoreconf by touching the right Makefile.in files. This mess can be dropped next time we update tar, as 0002/0003 will be part of the next tar release. Fixes: http://autobuild.buildroot.net/results/efdf7cf9ede810ed7f766cc4138b16054bc0c18a/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 69cbb563a124002fcb3e2725c3516b502587f9cc) Signed-off-by: Peter Korsgaard --- package/tar/tar.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/tar/tar.mk b/package/tar/tar.mk index a7e85afb72..bf3f1b6acb 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -12,6 +12,9 @@ TAR_LICENSE_FILES = COPYING TAR_CPE_ID_VENDOR = gnu TAR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) TAR_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +# 0002-Fix-savannah-bug-#64441.patch +# 0003-tests-fix-LDADD.patch +TAR_AUTORECONF = YES # busybox installs in /bin, so we need tar to install as well in /bin # so that we don't end up with two different tar @@ -58,4 +61,19 @@ HOST_TAR_CONF_ENV = \ CC="$(HOSTCC_NOCCACHE)" \ CXX="$(HOSTCXX_NOCCACHE)" +# Patches 0002-Fix-savannah-bug-#64441.patch and +# 0003-tests-fix-LDADD.patch are patching Makefile.am, so they do +# require TAR_AUTORECONF = YES above. However, for the host-tar +# package we can't do this: we can't have host-tar depend on +# host-{autoconf,automake,libtool} as those in turn might depend on +# host-tar. Since the patches 0002 and 0003 are only related to +# linking against libiconv, which is only an issue for the target tar, +# we do not autoreconf, and touch the corresponding Makefile.in to +# prevent them from being re-generated. +HOST_TAR_AUTORECONF = NO +define HOST_TAR_NO_AUTORECONF + touch $(@D)/src/Makefile.in $(@D)/tests/Makefile.in +endef +HOST_TAR_POST_PATCH_HOOKS += HOST_TAR_NO_AUTORECONF + $(eval $(host-autotools-package))