mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
Unbreak rebuilding docs with release tarballs
Release tarballs ship the include/libvirt/libvirt-common.h. when srcdir != builddir we end up including libvirt-common.h twice: from $top_srcdir/include/libvirt-common.h and from $builddir/include/libvirt-common.h leading to function virTypedParamsGetUInt from /tmp/buildd/libvirt-2.4.0/debian/build/docs/../include/libvirt/libvirt-common.h redeclared in /tmp/buildd/libvirt-2.4.0/docs/../include/libvirt/libvirt-common.h function virTypedParamsAddBoolean from /tmp/buildd/libvirt-2.4.0/debian/build/docs/../include/libvirt/libvirt-common.h redeclared in /tmp/buildd/libvirt-2.4.0/docs/../include/libvirt/libvirt-common.h … Only add the builddir to the search list if there is no pregenerated libvirt-common.h. Reuse the existing check that predates the libvirt.h → libvirt-common.h split and that probably was meant for exactly that. References: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=842452
This commit is contained in:
parent
11d571eaa7
commit
214c226f9e
@ -2607,10 +2607,9 @@ class app:
|
||||
dirs = [srcdir + "/../src",
|
||||
srcdir + "/../src/util",
|
||||
srcdir + "/../include/libvirt"]
|
||||
if builddir:
|
||||
if (builddir and
|
||||
not os.path.exists(srcdir + "/../include/libvirt/libvirt-common.h")):
|
||||
dirs.append(builddir + "/../include/libvirt")
|
||||
if glob.glob(srcdir + "/../include/libvirt/libvirt.h") == [] :
|
||||
dirs.append("../include/libvirt")
|
||||
builder = docBuilder(name, srcdir, dirs, [])
|
||||
elif glob.glob("src/libvirt.c") != [] :
|
||||
if not quiet:
|
||||
|
Loading…
Reference in New Issue
Block a user