[libvirt] [PATCH v2] Build breaker securityselinuxhelper.c

v2: syntax-check - need space on # include Commit 907a39e7 missed adding the WITH_ATTR around #include <attr/xattr.h> resulting in a build failure: CC libsecurityselinuxhelper_la-securityselinuxhelper.lo securityselinuxhelper.c:27:24: fatal error: attr/xattr.h: No such file or directory compilation terminated. make[2]: *** [libsecurityselinuxhelper_la-securityselinuxhelper.lo] Error 1 make[2]: Leaving directory `/home/jferlan/libvirt.work/tests' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/jferlan/libvirt.work' make: *** [all] Error 2 --- tests/securityselinuxhelper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index daad7dd..a9656a8 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> -#include <attr/xattr.h> +#if WITH_ATTR +# include <attr/xattr.h> +#endif /* -- 1.7.11.7

On Mon, Jan 14, 2013 at 01:45:55PM -0500, John Ferlan wrote:
v2: syntax-check - need space on # include
Commit 907a39e7 missed adding the WITH_ATTR around #include <attr/xattr.h> resulting in a build failure:
CC libsecurityselinuxhelper_la-securityselinuxhelper.lo securityselinuxhelper.c:27:24: fatal error: attr/xattr.h: No such file or directory compilation terminated. make[2]: *** [libsecurityselinuxhelper_la-securityselinuxhelper.lo] Error 1 make[2]: Leaving directory `/home/jferlan/libvirt.work/tests' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/jferlan/libvirt.work' make: *** [all] Error 2
--- tests/securityselinuxhelper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index daad7dd..a9656a8 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> -#include <attr/xattr.h> +#if WITH_ATTR +# include <attr/xattr.h> +#endif
ACK later usage of the functions is already conditionally protected. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

On 14.01.2013 19:45, John Ferlan wrote:
v2: syntax-check - need space on # include
I've dropped this line ^^ before pushing and borrowed $SUBJ from Guido's patch [1] before pushing. I hope you guys don't mind. Michal 1: https://www.redhat.com/archives/libvir-list/2013-January/msg00941.html
Commit 907a39e7 missed adding the WITH_ATTR around #include <attr/xattr.h> resulting in a build failure:
CC libsecurityselinuxhelper_la-securityselinuxhelper.lo securityselinuxhelper.c:27:24: fatal error: attr/xattr.h: No such file or directory compilation terminated. make[2]: *** [libsecurityselinuxhelper_la-securityselinuxhelper.lo] Error 1 make[2]: Leaving directory `/home/jferlan/libvirt.work/tests' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/jferlan/libvirt.work' make: *** [all] Error 2
--- tests/securityselinuxhelper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index daad7dd..a9656a8 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> -#include <attr/xattr.h> +#if WITH_ATTR +# include <attr/xattr.h> +#endif
/*
participants (3)
-
Daniel P. Berrange
-
John Ferlan
-
Michal Privoznik