External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround python header file insanity

Browse Source 
The /usr/include/python/pyconfig.h file pollutes the global
namespace with a huge number of HAVE_XXX and WITH_XXX
defines. These change what we detected in our own config.h
In particular if you try to build without DTrace, python's
headers turn it back on with predictable fail.

THe hack to workaround this is to rename WITH_DTRACE to
WITH_DTRACE_PROBES to avoid the namespace clash
This commit is contained in:
Daniel P. Berrange 2012-02-24 15:10:53 +00:00
parent af6b61ba06
commit 1d4c4d9d4f
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1378,10 +1378,10 @@ if test "$with_dtrace" != "no" ; then
with_dtrace=yes with_dtrace=yes
fi fi
if test "$with_dtrace" = "yes"; then if test "$with_dtrace" = "yes"; then
AC_DEFINE_UNQUOTED([WITH_DTRACE], 1, [whether DTrace static probes are available]) AC_DEFINE_UNQUOTED([WITH_DTRACE_PROBES], 1, [whether DTrace static probes are available])
fi fi
fi fi
AM_CONDITIONAL([WITH_DTRACE], [test "$with_dtrace" != "no"]) AM_CONDITIONAL([WITH_DTRACE_PROBES], [test "$with_dtrace" != "no"])
dnl NUMA lib dnl NUMA lib

2
daemon/Makefile.am
View File

@ -109,7 +109,7 @@ libvirtd_LDADD = \
$(SASL_LIBS) \ $(SASL_LIBS) \
$(POLKIT_LIBS) $(POLKIT_LIBS)
if WITH_DTRACE if WITH_DTRACE_PROBES
libvirtd_LDADD += ../src/probes.o libvirtd_LDADD += ../src/probes.o
endif endif

4
src/Makefile.am
View File

@ -1284,7 +1284,7 @@ libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS)
# picked out for us. # picked out for us.
libvirt_la_DEPENDENCIES = $(libvirt_la_BUILT_LIBADD) $(LIBVIRT_SYMBOL_FILE) libvirt_la_DEPENDENCIES = $(libvirt_la_BUILT_LIBADD) $(LIBVIRT_SYMBOL_FILE)
if WITH_DTRACE if WITH_DTRACE_PROBES
libvirt_la_BUILT_LIBADD += probes.o libvirt_la_BUILT_LIBADD += probes.o
libvirt_la_DEPENDENCIES += probes.o libvirt_la_DEPENDENCIES += probes.o
nodist_libvirt_la_SOURCES = probes.h nodist_libvirt_la_SOURCES = probes.h
@ -1521,7 +1521,7 @@ libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \
$(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \
$(RT_LIBS) \ $(RT_LIBS) \
../gnulib/lib/libgnu.la ../gnulib/lib/libgnu.la
if WITH_DTRACE if WITH_DTRACE_PROBES
libvirt_lxc_LDADD += probes.o libvirt_lxc_LDADD += probes.o
endif endif
if WITH_SECDRIVER_SELINUX if WITH_SECDRIVER_SELINUX

2
src/internal.h
View File

@ -247,7 +247,7 @@
# define VIR_DIV_UP(value, size) (((value) + (size) - 1) / (size)) # define VIR_DIV_UP(value, size) (((value) + (size) - 1) / (size))
# if WITH_DTRACE # if WITH_DTRACE_PROBES
# ifndef LIBVIRT_PROBES_H # ifndef LIBVIRT_PROBES_H
# define LIBVIRT_PROBES_H # define LIBVIRT_PROBES_H
# include "probes.h" # include "probes.h"

2
tests/Makefile.am
View File

@ -29,7 +29,7 @@ INCLUDES += \
endif endif
PROBES_O = PROBES_O =
if WITH_DTRACE if WITH_DTRACE_PROBES
PROBES_O += ../src/probes.o PROBES_O += ../src/probes.o
endif endif