| Message ID | 20211019172532.3431240-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] package/e2fsprogs: don't install compile_et | expand |
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > 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 <fontaine.fabrice@gmail.com> > --- > package/e2fsprogs/e2fsprogs.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk > index ca891066a2..76215e8c34 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 This is not so great as you then end up if without compile_et is e2fsprogs is (re)built after heimdall - But OK, heimdall depends on e2fsprogs so in a normal build this will not trigger. Committed, thanks.
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > 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 <fontaine.fabrice@gmail.com> Committed to 2021.02.x and 2021.08.x, thanks.
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index ca891066a2..76215e8c34 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))
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 <fontaine.fabrice@gmail.com> --- package/e2fsprogs/e2fsprogs.mk | 6 ++++++ 1 file changed, 6 insertions(+)