[Buildroot] [git commit branch/2021.08.x] package/e2fsprogs: don't install compile_et
From: Peter Korsgaard <peter@korsgaard.com>
Date: 2021-12-12 14:35:06
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=92309ec38c7b70115bb8b9db1e67cd8415a9325a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.08.x Don't install compile_et as it raises the following build failure with samba4 since, at least, bump to version 4.14.7 in commit 630e85f8f5ed64933b45599fc4332d9609177c5c: source4/heimdal/lib/asn1/asn1_err.c:47:23: error: 'link' redeclared as different kind of symbol 47 | static struct et_list link = { 0, 0 }; | ^~~~ In file included from /home/giuliobenetti/autobuild/run/instance-1/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/include/bits/sigstksz.h:24, from /home/giuliobenetti/autobuild/run/instance-1/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/include/signal.h:328, from /home/giuliobenetti/autobuild/run/instance-1/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/include/sys/param.h:28, from ../../lib/replace/../replace/replace.h:659, from ../../source4/heimdal_build/config.h:10, from source4/heimdal/lib/asn1/asn1_err.c:1: /home/giuliobenetti/autobuild/run/instance-1/output-1/host/s390x-buildroot-linux-gnu/sysroot/usr/include/unistd.h:819:12: note: previous declaration of 'link' was here 819 | extern int link (const char *__from, const char *__to) | ^~~~ Fixes: - http://autobuild.buildroot.org/results/d6de6ed59c553f6f413d280f3c65184945bb3850 Signed-off-by: Fabrice Fontaine <redacted> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit dd89074e8338b2114832469e2a188ff7824a7e25) Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- package/e2fsprogs/e2fsprogs.mk | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index bd147e737e..fd7e9fe744 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk@@ -90,5 +90,11 @@ define HOST_E2FSPROGS_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) install install-libs endef +# Remove compile_et which raises a build failure with samba4 +define HOST_E2FSPROGS_REMOVE_COMPILE_ET + $(RM) $(HOST_DIR)/bin/compile_et +endef +HOST_E2FSPROGS_POST_INSTALL_HOOKS += HOST_E2FSPROGS_REMOVE_COMPILE_ET + $(eval $(autotools-package)) $(eval $(host-autotools-package))
_______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot