On Fri, Jul 26, 2024 at 05:36:06PM GMT, Emil Velikov wrote:
Hey Lucas,
Thanks for going through and splitting this, even though wasn't
particularly fun.
One small note inline:
On Tue, 23 Jul 2024 at 19:59, Lucas De Marchi
<lucas.de.marchi@xxxxxxxxx> wrote:>
<snip>
diff --git a/m4/attributes.m4 b/m4/attributes.m4
index bfdb50f..208dfdc 100644
--- a/m4/attributes.m4
+++ b/m4/attributes.m4
@@ -1,23 +1,10 @@
+dnl SPDX-License-Identifier: GPL-2.0-or-later
+dnl
dnl Macros to check the presence of generic (non-typed) symbols.
dnl Copyright (c) 2006-2008 Diego Pettenò <flameeyes@xxxxxxxxx>
dnl Copyright (c) 2006-2008 xine project
dnl Copyright (c) 2012 Lucas De Marchi <lucas.de.marchi@xxxxxxxxx>
dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-dnl 02110-1301, USA.
-dnl
dnl As a special exception, the copyright owners of the
dnl macro gives unlimited permission to copy, distribute and modify the
dnl configure scripts that are the output of Autoconf when processing the
diff --git a/m4/features.m4 b/m4/features.m4
index 82a244f..6a9b5bd 100644
--- a/m4/features.m4
+++ b/m4/features.m4
@@ -1,17 +1,6 @@
-# Copyright (c) 2015 Lucas De Marchi <lucas.de.marchi@xxxxxxxxx>
-#
-# This program 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 2 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
+# SPDX-License-Identifier: GPL-2.0-or-later
#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see <http://www.gnu.org/licenses/>.
+# Copyright (c) 2015 Lucas De Marchi <lucas.de.marchi@xxxxxxxxx>
#
# As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure
@@ -25,7 +14,7 @@
# Macro released by the Autoconf Archive. When you make and distribute a
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
-#
+
# CC_FEATURE_APPEND([FLAGS], [ENV-TO-CHECK], [FLAG-NAME])
AC_DEFUN([CC_FEATURE_APPEND], [
AS_VAR_PUSHDEF([FLAGS], [$1])dnl
If I'm reading things correctly [1] [2], these two should be:
# SPDX-License-Identifier: GPL-2.0-or-later WITH Autoconf-exception-macro
... and the exception can be removed.
With that addressed - either as separate patch or squashed - the series is:
great, I'll remove this and queue in the ci-test branch.
Reviewed-by: Emil Velikov <emil.l.velikov@xxxxxxxxx>
Thanks
Lucas De Marchi
HTH
Emil
[1] https://spdx.org/licenses/exceptions-index.html
[2] https://spdx.org/licenses/Autoconf-exception-macro.html
