On Mon, 2013-11-11 at 13:51 -0700, Eric Blake wrote:
> On 11/11/2013 01:34 PM, Nikos Mavrogiannopoulos wrote:
> > Hello,
> > It seems that gnulib-tool installs files in build-aux like
> > "snippet/c++defs.h" that are under GPLv3+, even if the --lgpg=2 flag
>
> I assume you mean --lgpl=2
>
> > is specified. If these headers are GPLv3+ shouldn't they be skipped in
> > that case?
>
> No, that sounds like it might be a bug in gnulib-tool for not re-writing
> the header license. Would you like to help investigate? ALL
> gnulib-installed files should have their headers rewritten to match the
> intersection of the module license and the requested license of the
> gnulib-tool invocation; and modules/snippet/c++defs says that it is
> indeed under the LGPLv2+ license.
I'm not sure if that's correct, but here is a patch that solves the
header issue. However at this case the .sh files installed in build-aux
are also LGPL.
regards,
Nikos
diff --git a/gnulib-tool b/gnulib-tool
index 669931c..791bba5 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -4526,6 +4526,17 @@ s,^\(.................................................[^
]*\) *,
done
sed_transform_main_lib_file="$sed_transform_lib_file"
if test -n "$do_copyrights"; then
+ # Update license.
+ sed_transform_build_aux_file=$sed_transform_build_aux_file'
+ s/GNU Lesser General/GNU General/g
+ s/Lesser General Public License/General Public License/g
+
+ s/GNU Library General/GNU General/g
+ s/Library General Public License/General Public License/g
+
+ s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
+ '
+
if test -n "$lgpl"; then
# Update license.
case "$lgpl" in
@@ -4535,6 +4546,7 @@ s,^\(.................................................[^
]*\) *,
s/General Public License/Lesser General Public License/g
s/Lesser Lesser General Public License/Lesser General Public
License/g
'
+ sed_transform_build_aux_file=$sed_transform_main_lib_file
;;
2)
sed_transform_main_lib_file=$sed_transform_main_lib_file'
@@ -4544,6 +4556,7 @@ s,^\(.................................................[^
]*\) *,
s/version [23]\([ ,]\)/version 2.1\1/g
'
+ sed_transform_build_aux_file=$sed_transform_main_lib_file
;;
*) func_fatal_error "invalid value lgpl=$lgpl" ;;
esac
@@ -4562,19 +4575,6 @@ s,^\(.................................................[^
]*\) *,
fi
# Determine script to apply to auxiliary files that go into $auxdir/.
- sed_transform_build_aux_file=
- if test -n "$do_copyrights"; then
- # Update license.
- sed_transform_build_aux_file=$sed_transform_build_aux_file'
- s/GNU Lesser General/GNU General/g
- s/Lesser General Public License/General Public License/g
-
- s/GNU Library General/GNU General/g
- s/Library General Public License/General Public License/g
-
- s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
- '
- fi
# Determine script to apply to library files that go into $testsbase/.
sed_transform_testsrelated_lib_file="$sed_transform_lib_file"
