| Message ID | 1461950123-5498-1-git-send-email-jano.vesely@gmail.com |
|---|---|
| State | New |
| Headers | show |
On 29 April 2016 at 18:15, Jan Vesely <jano.vesely@gmail.com> wrote: > Fixes build failure with --enable-xfsctl and > new linux headers (>=4.5) and older xfsprogs(<4.5): > In file included from /usr/include/xfs/xfs.h:38:0, > from /var/tmp/portage/app-emulation/qemu-2.5.0-r1/work/qemu-2.5.0/block/raw-posix.c:97: > /usr/include/xfs/xfs_fs.h:42:8: error: redefinition of ‘struct fsxattr’ > struct fsxattr { > ^ > In file included from /var/tmp/portage/app-emulation/qemu-2.5.0-r1/work/qemu-2.5.0/block/raw-posix.c:60:0: > /usr/include/linux/fs.h:155:8: note: originally defined here > struct fsxattr { > > v2: Add explanatory comment > > CC: qemu-trivial@nongnu.org > CC: Markus Armbruster <armbru@redhat.com> > CC: Peter Maydell <peter.maydell@linaro.org> > CC: Stefan Weil <sw@weilnetz.de> > Signed-off-by: Jan Vesely <jano.vesely@gmail.com> Thanks for this patch. I have applied it to master (I tweaked the comment/commit message a little in the process, and added Stefan's tested-by tag.) -- PMM
diff --git a/configure b/configure index ab54f3c..2c3585c 100755 --- a/configure +++ b/configure @@ -4493,6 +4493,21 @@ if test "$fortify_source" != "no"; then fi fi +######################################## +# check if struct fsxattr is available + +have_fsxattr=no +cat > $TMPC << EOF +#include <linux/fs.h> +struct fsxattr foo; +int main(void) { + return 0; +} +EOF +if compile_prog "" "" ; then + have_fsxattr=yes +fi + ########################################## # End of CC checks # After here, no more $cc or $ld runs @@ -5160,6 +5175,12 @@ fi if test "$have_ifaddrs_h" = "yes" ; then echo "HAVE_IFADDRS_H=y" >> $config_host_mak fi + +# xfs headers will try to redefine structs from linux headers +# if this macro is not set +if test "$have_fsxattr" = "yes" ; then + echo "HAVE_FSXATTR=y" >> $config_host_mak +fi if test "$vte" = "yes" ; then echo "CONFIG_VTE=y" >> $config_host_mak echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak
Fixes build failure with --enable-xfsctl and new linux headers (>=4.5) and older xfsprogs(<4.5): In file included from /usr/include/xfs/xfs.h:38:0, from /var/tmp/portage/app-emulation/qemu-2.5.0-r1/work/qemu-2.5.0/block/raw-posix.c:97: /usr/include/xfs/xfs_fs.h:42:8: error: redefinition of ‘struct fsxattr’ struct fsxattr { ^ In file included from /var/tmp/portage/app-emulation/qemu-2.5.0-r1/work/qemu-2.5.0/block/raw-posix.c:60:0: /usr/include/linux/fs.h:155:8: note: originally defined here struct fsxattr { v2: Add explanatory comment CC: qemu-trivial@nongnu.org CC: Markus Armbruster <armbru@redhat.com> CC: Peter Maydell <peter.maydell@linaro.org> CC: Stefan Weil <sw@weilnetz.de> Signed-off-by: Jan Vesely <jano.vesely@gmail.com> --- configure | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)