From 82e1a0c5a0eeff78f7cefe2fcba3c19181b601d8 Mon Sep 17 00:00:00 2001 From: wfjm Date: Sun, 23 Jun 2019 09:42:47 +0200 Subject: [PATCH] Avoid ar 'u' modifier ignored; use SPDX tags - generic_so.mk: use -scrUuv for ar to avoid "'u' modifier ignored" - *.mk: add SPDX tag and copyright line --- doc/CHANGELOG.md | 2 ++ tools/make/dontincdep.mk | 4 +++- tools/make/generic_asm11.mk | 4 +++- tools/make/generic_asm11_def.mk | 4 +++- tools/make/generic_cpp.mk | 4 +++- tools/make/generic_dep.mk | 4 +++- tools/make/generic_so.mk | 7 +++++-- tools/make/generic_so_c.mk | 9 ++++++--- 8 files changed, 28 insertions(+), 10 deletions(-) diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index ee84e57d..691b3925 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -26,6 +26,7 @@ The full set of tests is only run for tagged releases. ### Summary - use vivado 2019.1 as default - finalize coverity fixups, now defect free +- use SPDX license tags, remove boilerplate license disclaimers ### New features - new tools @@ -39,6 +40,7 @@ The full set of tests is only run for tagged releases. - libr*/*: Stats() not longer const; use RtclStats::Exec() - librtools/RparseUrl: add DirName,FileName,FileStem,FileType - derive ReventFd and RtimerFd from Rfd + - generic_so.mk: use -scrUuv for ar to avoid "'u' modifier ignored" - firmware changes - sys_w11a_arty: down-rate to 72 MHz, viv 2019.1 fails with 75 MHz - sys_w11a_*.vmfset: add new rule for vivado 2019.1 diff --git a/tools/make/dontincdep.mk b/tools/make/dontincdep.mk index 38ea0336..adcda8cf 100644 --- a/tools/make/dontincdep.mk +++ b/tools/make/dontincdep.mk @@ -1,4 +1,6 @@ -# $Id: dontincdep.mk 477 2013-01-27 14:07:10Z mueller $ +# $Id: dontincdep.mk 1168 2019-06-20 11:52:51Z mueller $ +# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright 2013- by Walter F.J. Mueller # # Revision History: # Date Rev Version Comment diff --git a/tools/make/generic_asm11.mk b/tools/make/generic_asm11.mk index c7d58b05..cecc02f5 100644 --- a/tools/make/generic_asm11.mk +++ b/tools/make/generic_asm11.mk @@ -1,4 +1,6 @@ -# $Id: generic_asm11.mk 503 2013-04-06 19:44:13Z mueller $ +# $Id: generic_asm11.mk 1168 2019-06-20 11:52:51Z mueller $ +# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright 2013- by Walter F.J. Mueller # # Revision History: # Date Rev Version Comment diff --git a/tools/make/generic_asm11_def.mk b/tools/make/generic_asm11_def.mk index 8e6c9450..d24056d8 100644 --- a/tools/make/generic_asm11_def.mk +++ b/tools/make/generic_asm11_def.mk @@ -1,4 +1,6 @@ -# $Id: generic_asm11_def.mk 1147 2019-05-11 07:08:40Z mueller $ +# $Id: generic_asm11_def.mk 1168 2019-06-20 11:52:51Z mueller $ +# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright 2019- by Walter F.J. Mueller # # Revision History: # Date Rev Version Comment diff --git a/tools/make/generic_cpp.mk b/tools/make/generic_cpp.mk index ac40df5e..d5bdc950 100644 --- a/tools/make/generic_cpp.mk +++ b/tools/make/generic_cpp.mk @@ -1,4 +1,6 @@ -# $Id: generic_cpp.mk 1049 2018-09-22 13:56:52Z mueller $ +# $Id: generic_cpp.mk 1168 2019-06-20 11:52:51Z mueller $ +# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright 2011-2018 by Walter F.J. Mueller # # Revision History: # Date Rev Version Comment diff --git a/tools/make/generic_dep.mk b/tools/make/generic_dep.mk index 69131efd..789707bf 100644 --- a/tools/make/generic_dep.mk +++ b/tools/make/generic_dep.mk @@ -1,4 +1,6 @@ -# $Id: generic_dep.mk 354 2011-01-09 22:38:53Z mueller $ +# $Id: generic_dep.mk 1168 2019-06-20 11:52:51Z mueller $ +# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright 2011- by Walter F.J. Mueller # # Revision History: # Date Rev Version Comment diff --git a/tools/make/generic_so.mk b/tools/make/generic_so.mk index d58d9185..83f6d1c3 100644 --- a/tools/make/generic_so.mk +++ b/tools/make/generic_so.mk @@ -1,7 +1,10 @@ -# $Id: generic_so.mk 733 2016-02-20 12:24:13Z mueller $ +# $Id: generic_so.mk 1168 2019-06-20 11:52:51Z mueller $ +# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright 2011-2019 by Walter F.J. Mueller # # Revision History: # Date Rev Version Comment +# 2019-06-20 1168 1.1 use -scrUuv for ar to avoid "'u' modifier ignored" # 2013-05-03 515 1.0.1 use 'mkdir -p' to prevent aborts with -j 4 # 2011-01-09 354 1.0 Initial version (from wrepo/make/generic_so.mk) #--- @@ -40,5 +43,5 @@ $(SOPATH)/$(SOFILEVV) : $(OBJ_all) # $(SOPATH)/$(AFILE) : $(OBJ_all) if [ ! -d $(SOPATH) ]; then mkdir -p $(SOPATH); fi - ar -scruv $(SOPATH)/$(AFILE) $? + ar -scrUuv $(SOPATH)/$(AFILE) $? # diff --git a/tools/make/generic_so_c.mk b/tools/make/generic_so_c.mk index 84fc2d32..552d5bfc 100644 --- a/tools/make/generic_so_c.mk +++ b/tools/make/generic_so_c.mk @@ -1,8 +1,11 @@ -# $Id: generic_so_c.mk 733 2016-02-20 12:24:13Z mueller $ +# $Id: generic_so_c.mk 1168 2019-06-20 11:52:51Z mueller $ +# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright 2014-2019 by Walter F.J. Mueller # # Revision History: # Date Rev Version Comment -# 2014-11-02 600 1.0. Initial version (cloned from generic_so.mk) +# 2019-06-20 1168 1.1 use -scrUuv for ar to avoid "'u' modifier ignored" +# 2014-11-02 600 1.0 Initial version (cloned from generic_so.mk) #--- # # Build a sharable library and an archive @@ -41,5 +44,5 @@ $(SOPATH)/$(SOFILEVV) : $(OBJ_all) # $(SOPATH)/$(AFILE) : $(OBJ_all) if [ ! -d $(SOPATH) ]; then mkdir -p $(SOPATH); fi - ar -scruv $(SOPATH)/$(AFILE) $? + ar -scrUuv $(SOPATH)/$(AFILE) $? #