Re: dependencies with incompatible licenses: parse-datetime

2016-10-22 Thread Bruno Haible
Jim Meyering wrote:
> > 2016-10-15  Bruno Haible  
> >
> > Avoid gnulib-tool warnings about the dependencies of 
> > 'parse-datetime'.
> > * gnulib-tool (func_get_license): Special-case the 'parse-datetime'
> > module.
> 
> Looks fine, and fine by me.
> Thank you.

OK, I've pushed it.




Re: dependencies with incompatible licenses: parse-datetime

2016-10-15 Thread Jim Meyering
On Sat, Oct 15, 2016 at 7:15 AM, Bruno Haible  wrote:
> When I run
>
> $ ./gnulib-tool --create-testdir --with-tests --dir=/tmp/testdir1
>
> I get these warnings, among others:
>
> gnulib-tool: warning: module parse-datetime depends on a module with an 
> incompatible license: error
> gnulib-tool: warning: module parse-datetime depends on a module with an 
> incompatible license: getprogname
> gnulib-tool: warning: module parse-datetime depends on a module with an 
> incompatible license: gettime
> gnulib-tool: warning: module parse-datetime depends on a module with an 
> incompatible license: strftime
> gnulib-tool: warning: module parse-datetime depends on a module with an 
> incompatible license: time_rz
> gnulib-tool: warning: module parse-datetime depends on a module with an 
> incompatible license: timespec
> gnulib-tool: warning: module parse-datetime depends on a module with an 
> incompatible license: xalloc
> gnulib-tool: warning: module parse-datetime depends on a module with an 
> incompatible license: xalloc-die
>
> These were introduced on 2015-11-24
> http://lists.gnu.org/archive/html/bug-gnulib/2015-11/msg00048.html
>
> The ostree people work around this warning by not using gnulib-tool.
> They just copied the files lib/parse-datetime.[hy] and edited them to use
> g_malloc instead of xmalloc.
>
> I would like to silence this warning, while at the same time not change the
> actual license of the module. Here's a proposed patch. A quick hack; I hope
> we won't have this situation more often.
>
>
> 2016-10-15  Bruno Haible  
>
> Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
> * gnulib-tool (func_get_license): Special-case the 'parse-datetime'
> module.

Looks fine, and fine by me.
Thank you.



dependencies with incompatible licenses: parse-datetime

2016-10-15 Thread Bruno Haible
When I run

$ ./gnulib-tool --create-testdir --with-tests --dir=/tmp/testdir1

I get these warnings, among others:

gnulib-tool: warning: module parse-datetime depends on a module with an 
incompatible license: error
gnulib-tool: warning: module parse-datetime depends on a module with an 
incompatible license: getprogname
gnulib-tool: warning: module parse-datetime depends on a module with an 
incompatible license: gettime
gnulib-tool: warning: module parse-datetime depends on a module with an 
incompatible license: strftime
gnulib-tool: warning: module parse-datetime depends on a module with an 
incompatible license: time_rz
gnulib-tool: warning: module parse-datetime depends on a module with an 
incompatible license: timespec
gnulib-tool: warning: module parse-datetime depends on a module with an 
incompatible license: xalloc
gnulib-tool: warning: module parse-datetime depends on a module with an 
incompatible license: xalloc-die

These were introduced on 2015-11-24
http://lists.gnu.org/archive/html/bug-gnulib/2015-11/msg00048.html

The ostree people work around this warning by not using gnulib-tool.
They just copied the files lib/parse-datetime.[hy] and edited them to use
g_malloc instead of xmalloc.

I would like to silence this warning, while at the same time not change the
actual license of the module. Here's a proposed patch. A quick hack; I hope
we won't have this situation more often.


2016-10-15  Bruno Haible  

Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
* gnulib-tool (func_get_license): Special-case the 'parse-datetime'
module.

diff --git a/gnulib-tool b/gnulib-tool
index 45d5fe0..8f74f9c 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2570,11 +2570,21 @@ func_get_license ()
   fi
   ;;
   esac
-  {
-func_get_license_raw "$1"
-# The default is GPL.
-echo "GPL"
-  } | sed -e 's,^ *$,,' | sed -e 1q
+  case "$1" in
+parse-datetime )
+  # These modules are under a weaker license only for the purpose of some
+  # users who hand-edit it and don't use gnulib-tool. For the regular
+  # gnulib users they are under a stricter license.
+  echo "GPL"
+  ;;
+* )
+  {
+func_get_license_raw "$1"
+# The default is GPL.
+echo "GPL"
+  } | sed -e 's,^ *$,,' | sed -e 1q
+  ;;
+  esac
 }
 
 # func_get_maintainer module

--
In memoriam Thomas Sankara