CVS commit: src/external/gpl2/gmake/dist/doc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Mar 14 05:50:08 UTC 2022

Modified Files:
src/external/gpl2/gmake/dist/doc: Makefile.in

Log Message:
apply some NetBSD_Disabled_make.info: love to avoid a source tree
timestamp issue with read-only sources.  fixes PR#42497.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/doc/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl2/gmake/dist/doc/Makefile.in
diff -u src/external/gpl2/gmake/dist/doc/Makefile.in:1.1.1.1 src/external/gpl2/gmake/dist/doc/Makefile.in:1.2
--- src/external/gpl2/gmake/dist/doc/Makefile.in:1.1.1.1	Mon Aug 18 06:47:41 2014
+++ src/external/gpl2/gmake/dist/doc/Makefile.in	Mon Mar 14 05:50:08 2022
@@ -281,6 +281,8 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	  exit 1; \
 	fi
 $(srcdir)/make.info: make.texi $(srcdir)/version.texi $(make_TEXINFOS)
+	@echo "NOT REBUILDING $@"
+NetBSD_DISABLED_make.info:
 make.dvi: make.texi $(srcdir)/version.texi $(make_TEXINFOS)
 make.pdf: make.texi $(srcdir)/version.texi $(make_TEXINFOS)
 make.html: make.texi $(srcdir)/version.texi $(make_TEXINFOS)

CVS commit: src/external/gpl2/gmake/dist/doc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Mar 14 05:50:08 UTC 2022

Modified Files:
src/external/gpl2/gmake/dist/doc: Makefile.in

Log Message:
apply some NetBSD_Disabled_make.info: love to avoid a source tree
timestamp issue with read-only sources.  fixes PR#42497.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/doc/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Re: CVS commit: src/external/gpl2/gmake/dist

[Frédéric Fauberteau]

Le 2018-06-01 11:05, Kamil Rytarowski a écrit :

On 01.06.2018 10:33, Frédéric Fauberteau wrote:

Le 2018-05-01 03:23, Kamil Rytarowski a écrit :

On 01.05.2018 02:55, Christos Zoulas wrote:

In article
,
Kimihiro Nonaka   wrote:

2018-05-01 8:53 GMT+09:00 Kamil Rytarowski :


This is polling GPLv3 code into GPLv2 gmake - these licenses are
incompatible.


You mean pulling here? There is no pulling GPLv3 code unless the 
code

is copied from GPLv3.



It was cherry-picked from GPLv3+.


Thanks to the following patch, I can cross-build a toolset on my Arch
box. When I look at the make.git tree:
http://git.savannah.gnu.org/cgit/make.git/tree/
I don't see any 'configure' file. In which way this patch breaks the
license?

Index: configure
===
RCS file: /cvsroot/src/external/gpl2/gmake/dist/configure,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 configure
--- configure    18 Aug 2014 06:46:54 -    1.1.1.1
+++ configure    1 Jun 2018 08:05:31 -
@@ -13619,10 +13619,9 @@
 #include 
 #include 

-#define GLOB_INTERFACE_VERSION 1
 #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
 # include 
-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION 
== 2

    gnu glob
 # endif
 #endif


http://git.savannah.gnu.org/cgit/make.git/tree/configure.ac#n6

# GNU Make is free software; you can redistribute it and/or modify it 
under

# the terms of the GNU General Public License as published by the Free
Software
# Foundation; either version 3 of the License, or (at your option) any 
later

# version.

GPL2 and GPL3 are incompatible for some reasons.. we could just upgrade
gmake to GPLv3. It's used for building GCC only.


I am not sure to understand correctly. If we modify GNU Make 3.81 (by 
applying a patch) that is distributed in our sources, we redistribute it 
under the terms of GPLv2. No? Do you mean that this line:
# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 
2
is GPLv3 licensed? And therefore we should redistribute the whole GNU 
Make code under the terms of GPLv3?
This line can be found here: 
https://git.busybox.net/buildroot/tree/package/make/0001-configure.ac-Support-GLIBC-glob-interface-version-2.patch?id=157231405d219e484aa3829acff23569f6a60d00

in a project that is GPLv2 distributed.

I don't want to be too many insistent. Could we imagine putting GNU Make 
4.2.1 under external/gpl3/gmake/dist?

Re: CVS commit: src/external/gpl2/gmake/dist

[Kamil Rytarowski]

On 01.06.2018 10:33, Frédéric Fauberteau wrote:
> Le 2018-05-01 03:23, Kamil Rytarowski a écrit :
>> On 01.05.2018 02:55, Christos Zoulas wrote:
>>> In article
>>> ,
>>> Kimihiro Nonaka   wrote:
 2018-05-01 8:53 GMT+09:00 Kamil Rytarowski :

> This is polling GPLv3 code into GPLv2 gmake - these licenses are
> incompatible.
>>>
>>> You mean pulling here? There is no pulling GPLv3 code unless the code
>>> is copied from GPLv3.
>>>
>>
>> It was cherry-picked from GPLv3+.
> 
> Thanks to the following patch, I can cross-build a toolset on my Arch
> box. When I look at the make.git tree:
> http://git.savannah.gnu.org/cgit/make.git/tree/
> I don't see any 'configure' file. In which way this patch breaks the
> license?
> 
> Index: configure
> ===
> RCS file: /cvsroot/src/external/gpl2/gmake/dist/configure,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 configure
> --- configure    18 Aug 2014 06:46:54 -    1.1.1.1
> +++ configure    1 Jun 2018 08:05:31 -
> @@ -13619,10 +13619,9 @@
>  #include 
>  #include 
> 
> -#define GLOB_INTERFACE_VERSION 1
>  #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
>  # include 
> -# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
> +# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
>     gnu glob
>  # endif
>  #endif

http://git.savannah.gnu.org/cgit/make.git/tree/configure.ac#n6

# GNU Make is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.

GPL2 and GPL3 are incompatible for some reasons.. we could just upgrade
gmake to GPLv3. It's used for building GCC only.



signature.asc
Description: OpenPGP digital signature

Re: CVS commit: src/external/gpl2/gmake/dist

[Frédéric Fauberteau]

Le 2018-05-01 03:23, Kamil Rytarowski a écrit :

On 01.05.2018 02:55, Christos Zoulas wrote:
In article 
,

Kimihiro Nonaka   wrote:

2018-05-01 8:53 GMT+09:00 Kamil Rytarowski :


This is polling GPLv3 code into GPLv2 gmake - these licenses are
incompatible.


You mean pulling here? There is no pulling GPLv3 code unless the code
is copied from GPLv3.



It was cherry-picked from GPLv3+.


Thanks to the following patch, I can cross-build a toolset on my Arch 
box. When I look at the make.git tree: 
http://git.savannah.gnu.org/cgit/make.git/tree/
I don't see any 'configure' file. In which way this patch breaks the 
license?


Index: configure
===
RCS file: /cvsroot/src/external/gpl2/gmake/dist/configure,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 configure
--- configure   18 Aug 2014 06:46:54 -  1.1.1.1
+++ configure   1 Jun 2018 08:05:31 -
@@ -13619,10 +13619,9 @@
 #include 
 #include 

-#define GLOB_INTERFACE_VERSION 1
 #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
 # include 
-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 
2

gnu glob
 # endif
 #endif

Re: CVS commit: src/external/gpl2/gmake/dist

[Kamil Rytarowski]

On 28.04.2018 14:20, NONAKA Kimihiro wrote:
> Module Name:  src
> Committed By: nonaka
> Date: Sat Apr 28 12:20:41 UTC 2018
> 
> Modified Files:
>   src/external/gpl2/gmake/dist: configure configure.in
> 
> Log Message:
> gmake: Apply patch to support GLIBC glob interface v2
> 
> http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116
> 
> Fix a build failure on Ubuntu 18.04.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/configure \
> src/external/gpl2/gmake/dist/configure.in
> 

This is polling GPLv3 code into GPLv2 gmake - these licenses are
incompatible.

I think we should either upgrade it to GPLv3 now or remove it.



signature.asc
Description: OpenPGP digital signature

Re: CVS commit: src/external/gpl2/gmake/dist

[Kamil Rytarowski]

On 01.05.2018 02:55, Christos Zoulas wrote:
> In article 
> ,
> Kimihiro Nonaka   wrote:
>> 2018-05-01 8:53 GMT+09:00 Kamil Rytarowski :
>>
>>> This is polling GPLv3 code into GPLv2 gmake - these licenses are
>>> incompatible.
> 
> You mean pulling here? There is no pulling GPLv3 code unless the code
> is copied from GPLv3.
> 

It was cherry-picked from GPLv3+.



signature.asc
Description: OpenPGP digital signature

Re: CVS commit: src/external/gpl2/gmake/dist

[Christos Zoulas]

In article ,
Kimihiro Nonaka   wrote:
>2018-05-01 8:53 GMT+09:00 Kamil Rytarowski :
>
>> This is polling GPLv3 code into GPLv2 gmake - these licenses are
>> incompatible.

You mean pulling here? There is no pulling GPLv3 code unless the code
is copied from GPLv3.

>> I think we should either upgrade it to GPLv3 now or remove it.
>
>I've reverted it.
>
>Thank you for your report.

If you wrote the patch and you did not copy it from the new gmake, you don't
need to delete it. Making it work with a newer glibc does not change the
license of the program (GLIBC is LGPL so it does not taint).

christos

Re: CVS commit: src/external/gpl2/gmake/dist

[Kimihiro Nonaka]

2018-05-01 8:53 GMT+09:00 Kamil Rytarowski :

> This is polling GPLv3 code into GPLv2 gmake - these licenses are
> incompatible.
>
> I think we should either upgrade it to GPLv3 now or remove it.

I've reverted it.

Thank you for your report.

-- 
Kimihiro Nonaka