[Libguestfs] [PATCH 6/7] python: stop including config.h

Richard W.M. Jones rjones at redhat.com
Fri Jan 10 22:13:35 UTC 2020


On Thu, Jan 09, 2020 at 06:37:49PM +0100, Pino Toscano wrote:
> There is nothing in the Python bindings that require results from
> configure, and gnulib is not used already.
> ---
>  generator/python.ml | 6 ------
>  python/handle.c     | 2 --
>  2 files changed, 8 deletions(-)

I guess the motivation is because we cannot create this header
correctly from PyPi so it'll be wrong there?  I still think we might
need this header when compiling libguestfs Python bindings in the
normal (not PyPi) case, even if it happens to work right now.

Could we instead defend these with #ifdef HAVE_CONFIG_H?  That way the
header shouldn't be used for PyPi and shouldn't need to be bundled (so
patch #7 would be OK).

Rich.

> diff --git a/generator/python.ml b/generator/python.ml
> index 0e1ed20d8..fd297321e 100644
> --- a/generator/python.ml
> +++ b/generator/python.ml
> @@ -119,8 +119,6 @@ and generate_python_structs () =
>    generate_header CStyle LGPLv2plus;
>  
>    pr "\
> -#include <config.h>
> -
>  #include <stdio.h>
>  #include <stdlib.h>
>  #include <assert.h>
> @@ -251,8 +249,6 @@ and generate_python_actions actions () =
>    generate_header CStyle LGPLv2plus;
>  
>    pr "\
> -#include <config.h>
> -
>  /* It is safe to call deprecated functions from this file. */
>  #define GUESTFS_NO_WARN_DEPRECATED
>  #undef GUESTFS_NO_DEPRECATED
> @@ -542,8 +538,6 @@ and generate_python_module () =
>    generate_header CStyle LGPLv2plus;
>  
>    pr "\
> -#include <config.h>
> -
>  #include <stdio.h>
>  #include <stdlib.h>
>  #include <assert.h>
> diff --git a/python/handle.c b/python/handle.c
> index 21077bba9..8200adb52 100644
> --- a/python/handle.c
> +++ b/python/handle.c
> @@ -22,8 +22,6 @@
>   * F<python/actions-*.c>).
>   */
>  
> -#include <config.h>
> -
>  #include <stdio.h>
>  #include <stdlib.h>
>  
> -- 
> 2.24.1
> 
> _______________________________________________
> Libguestfs mailing list
> Libguestfs at redhat.com
> https://www.redhat.com/mailman/listinfo/libguestfs

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v




More information about the Libguestfs mailing list