[Libvir] 1/22 Pull in more Gnulib modules

Jim Meyering jim at meyering.net
Fri Dec 7 13:57:06 UTC 2007


"Richard W.M. Jones" <rjones at redhat.com> wrote:
> (However the documentation for physmem says the module is under
> LGPLv2+ so either the documentation is wrong or the top of the file is
> wrong or else I don't understand what's going on here).
>
> Unfortunately although all the modules above are LGPLv2, I just
> noticed that getpass depends indirectly on realloc.  Documentation for
> realloc says its LGPLv2+ so I didn't think it was a problem, but the
> top of the file says LGPLv3.

Using gnulib-tools' --lgpl=2 option fixes this.
That will cause the copyright notices to be rewritten.
However, that currently excludes *all* of the unit tests, because
these tests rely on LGPLv3 modules.  So the easiest solution
(though it's unfortunate for both libvirt and gnulib) is to give
up those unit tests: i.e., to remove the --with-tests option below.
And without the tests, there's no need for the three --avoid= options:

diff --git a/bootstrap b/bootstrap
index 73ad3f6..474f4a8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -92,15 +92,11 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 avoid='--avoid=snprintf'

 avoid='
-  --avoid=snprintf-tests
-  --avoid=vasnprintf-tests
-  --avoid=alloca-opt-tests
 '

 $gnulib_tool			\
-  --lgpl			\
+  --lgpl=2			\
   $avoid			\
-  --with-tests			\
   --m4-base=gnulib/m4		\
   --source-base=gnulib/lib	\
   --tests-base=gnulib/tests	\

That empties the gnulib/tests directory of all its *.c files,
but I'd like to leave it (with just Makefile.am), in the hopes
we can work out a compromise that lets us use the tests again.

I'll prepare a patch along these lines.




More information about the libvir-list mailing list