[CRIU] [PATCH] [v2] travis: workaround a compilation error for fedora rawhide

Adrian Reber areber at redhat.com
Wed Oct 4 09:29:39 MSK 2017


On Wed, Oct 04, 2017 at 02:23:01AM +0300, Andrei Vagin wrote:
> From: Andrei Vagin <avagin at virtuozzo.com>
> 
> In file included from /usr/include/linux/aio_abi.h:31:0,
>                  from criu/cr-check.c:24:
> /usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant
>    MS_RDONLY = 1,  /* Mount read-only.  */
>    ^
> make[2]: *** [/criu/scripts/nmk/scripts/build.mk:111: criu/cr-check.o] Error 1
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [criu/Makefile:80: criu/built-in.o] Error 2
> make: *** [Makefile:230: criu] Error 2
> 
> Cc: Adrian Reber <areber at redhat.com>
> Signed-off-by: Andrei Vagin <avagin at virtuozzo.com>

Acked-by: Adrian Reber <areber at redhat.com>

That is the same patch I am using in Fedora right now:

https://src.fedoraproject.org/rpms/criu/blob/master/f/0001-fix-building-on-newest-glibc-and-kernel.patch

Maybe including your bug report in the commit message would make sense:

https://bugzilla.redhat.com/show_bug.cgi?id=1497501

> ---
>  criu/cr-check.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/criu/cr-check.c b/criu/cr-check.c
> index 3bf335b34..5de360c8d 100644
> --- a/criu/cr-check.c
> +++ b/criu/cr-check.c
> @@ -21,8 +21,8 @@
>  #include <netinet/in.h>
>  #include <sys/prctl.h>
>  #include <sched.h>
> -#include <linux/aio_abi.h>
>  #include <sys/mount.h>
> +#include <linux/aio_abi.h>
>  
>  #include "../soccr/soccr.h"
>  
> -- 
> 2.13.3
> 


More information about the CRIU mailing list