On Mon, Nov 11, 2013 at 9:51 PM, Eric Blake <ebl...@redhat.com> 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
>> 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 think that the attached patch correctly fixes the issue. It
separates build-aux/ files from build-aux/snippet files, and uses the
main library license for the latter.
regards,
Nikos
From de97bc88bc62e767d3f5d3364f95ad68cd647def Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <n...@redhat.com>
Date: Tue, 12 Nov 2013 10:26:31 +0100
Subject: [PATCH] Use the main library license for build-aux/snippet files.
---
gnulib-tool | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gnulib-tool b/gnulib-tool
index 669931c..8f88d31 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -4560,6 +4560,7 @@ s,^\(.................................................[^ ]*\) *,
'
fi
fi
+ sed_transform_build_aux_snippet_file=$sed_transform_main_lib_file
# Determine script to apply to auxiliary files that go into $auxdir/.
sed_transform_build_aux_file=
@@ -4714,6 +4715,10 @@ s,^\(.................................................[^ ]*\) *,
fi
if test -n "$sed_transform_build_aux_file"; then
case "$of" in
+ build-aux/snippet/*)
+ sed -e "$sed_transform_build_aux_snippet_file" \
+ < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed"
+ ;;
build-aux/*)
sed -e "$sed_transform_build_aux_file" \
< "$lookedup_file" > "$tmpfile" || func_fatal_error "failed"
--
1.8.4.2
