Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit 0c6eca5

Browse files
author
Grant Erickson
committed
Update to reflect upstream repository 'https://github.com:nestlabs/nlbuild-autotools' at tag '1.7.3'.
1 parent 23f3957 commit 0c6eca5

File tree

24 files changed

+772
-198
lines changed

24 files changed

+772
-198
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.14
1+
1.7.3
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.local-version
2+
tools/host/
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
This is the official list of nlbuild-autotools authors for copyright purposes.
2+
3+
This does not necessarily list everyone who has contributed code, since in
4+
some cases, their employer may be the copyright holder. To see the full list
5+
of contributors, see the revision history in source control or
6+
https://github.com/nestlabs/nlbuild-autotools/graphs/contributors.
7+
8+
Authors who wish to be recognized in this file should add themselves (or
9+
their employing organization, as appropriate):
10+
11+
# Organizations
12+
13+
* Apple, Inc.
14+
* Google LLC
15+
* Nest Labs, Inc.
16+
17+
# Individuals
18+
19+
* Giuseppe Andreello <[email protected]>
20+
* Adam Eliot <[email protected]>
21+
* Grant Erickson <[email protected]>
22+
* Betsy Lichtenberg <[email protected]>
23+
* Robert Szewczyk <[email protected]>
24+
* Rob Walker <[email protected]>
25+
* Justin Wood <[email protected]>
26+
* Yakun Xu <[email protected]>

third_party/nlbuild-autotools/repo/CHANGES

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,96 @@
1+
1.7.3 (2020-05-11)
2+
3+
* Addressed an issue in which NL_ENABLE_COVERAGE,
4+
NL_ENABLE_DEBUG, and NL_ENABLE_OPTIMIZATION failed to
5+
correctly transform their respective flags when the values
6+
they control are satisfied from the configuration cache.
7+
8+
1.7.2 (2020-04-22)
9+
10+
* Incorporated changes to refactor makedirs to use sentinel
11+
files rather than forced phony targets. Renamed makedirs
12+
(MAKEDIRS and MAKEDIRS_TARGETS) to foreign dependencies
13+
(NLFOREIGN_SUBDIR_DEPENDENCIES and
14+
NLFOREIGN_FILE_DEPENDENCIES).
15+
16+
* Added foreign dependency examples to the project skeleton.
17+
18+
* Addressed an issue to allow nl-check-file-with-subroutine to
19+
tolerate parallel builds.
20+
21+
* Addressed shellcheck and other minor issues with
22+
bootstrap-configure.
23+
24+
1.7.1 (2020-04-15)
25+
26+
* Addressed an issue in which the use of MAKDIRS and
27+
MAKEDIRS_TARGETS resulted in undesireable target rebuilds.
28+
29+
1.7.0 (2020-04-14)
30+
31+
* Added support for project-global targets and target
32+
subdirectories that can be used to allow for "build from
33+
anywhere plus dependencies" functionality that does not
34+
first require a top-level build.
35+
36+
* Added jobs support for tools/packages/build to take
37+
advantage of multi-CPUs/-cores when available.
38+
39+
1.6.24 (2020-04-08)
40+
41+
* Ensure that 'coverage-recursive' is included in the
42+
canonical set of known recursive targets such that
43+
dependency rules like "$(RECURSIVE_TARGETS):
44+
$(lib_LIBRARIES)" work correctly.
45+
46+
1.6.23 (2020-04-07)
47+
48+
* Collapse generate-coverage-report and
49+
generate-coverage-report-with-filter into a single function.
50+
51+
1.6.22 (2020-04-07)
52+
53+
* Suppress non-failure diagnostic output from bootstrap tool actions
54+
unless there is failure status from those actions or the
55+
verbose flag has been asserted.
56+
57+
* Ensure failure status from bootstrap tool actions is
58+
captured and passed to invoking processes.
59+
60+
1.6.21 (2020-03-30)
61+
62+
* Allow examples/bootstrap may be run from anywhere.
63+
64+
* Added AUTHORS.md.
65+
66+
1.6.20 (2020-03-26)
67+
68+
* Ensure that several scripts that use bashisms specify bash
69+
for the shebang. Additionally, invoke bash through env to
70+
maximize downrev shell compatibility.
71+
72+
* Add tools/host/... to .gitignore.
73+
74+
1.6.19 (2020-03-18)
75+
76+
* Fix awk invocation error in tools/packages/build triggered by
77+
'make tools'.
78+
79+
1.6.18 (2020-03-18)
80+
81+
* Address a typo in bootstrap scripts introduced in 1.6.17.
82+
83+
1.6.17 (2020-03-17)
84+
85+
* Avoid potential disagreement among srcdir and abs_srcdir for
86+
bootstrap scripts.
87+
88+
* Address shellcheck warnings.
89+
90+
1.6.16 (2020-01-23)
91+
92+
* Allow absolute paths in PRETTY_FILES.
93+
194
1.6.15 (2019-12-06)
295

396
* Remove redundant libtool m4 libraries.

third_party/nlbuild-autotools/repo/MANIFEST

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.default-version
22
.gitignore
33
.travis.yml
4+
AUTHORS.md
45
CHANGES
56
Common.mak
67
CONTRIBUTING.md

third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_coverage.m4

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#
2+
# Copyright 2020 Project nlbuild-autotools Authors. All Rights Reserved.
23
# Copyright 2015-2016 Nest Labs Inc. All Rights Reserved.
34
#
45
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -53,7 +54,7 @@ AC_DEFUN([NL_ENABLE_COVERAGE],
5354
[m4_fatal([$0: invalid default value '$1'; must be 'yes' or 'no'])])
5455
5556
AC_CACHE_CHECK([whether to build code-coverage instances of programs and libraries],
56-
nl_cv_build_coverage,
57+
[nl_cv_build_coverage],
5758
[
5859
AC_ARG_ENABLE(coverage,
5960
[AS_HELP_STRING([--enable-coverage],[Enable the generation of code-coverage instances @<:@default=$1@:>@.])],
@@ -84,20 +85,21 @@ AC_DEFUN([NL_ENABLE_COVERAGE],
8485
8586
fi
8687
])
87-
88-
if test "${nl_cv_build_coverage}" = "yes"; then
89-
if test "${GCC}" != "yes"; then
90-
AC_MSG_ERROR([GCC or a GCC-compatible toolchain is required for --enable-coverage])
91-
else
92-
NL_COVERAGE_CPPFLAGS="--coverage"
93-
if ${CC} --version | grep -q clang; then
94-
NL_COVERAGE_LDFLAGS="--coverage"
95-
else
96-
NL_COVERAGE_LIBS="-lgcov"
97-
fi
98-
fi
99-
fi
10088
])
89+
90+
if test "${nl_cv_build_coverage}" = "yes"; then
91+
if test "${GCC}" != "yes"; then
92+
AC_MSG_ERROR([GCC or a GCC-compatible toolchain is required for --enable-coverage])
93+
else
94+
NL_COVERAGE_CPPFLAGS="--coverage"
95+
if ${CC} --version | grep -q clang; then
96+
NL_COVERAGE_LDFLAGS="--coverage"
97+
else
98+
NL_COVERAGE_LIBS="-lgcov"
99+
fi
100+
fi
101+
fi
102+
101103
])
102104

103105

third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_debug.m4

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#
2+
# Copyright 2020 Project nlbuild-autotools Authors. All Rights Reserved.
23
# Copyright 2015-2016 Nest Labs Inc. All Rights Reserved.
34
#
45
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,7 +49,7 @@ AC_DEFUN([NL_ENABLE_DEBUG],
4849
[m4_fatal([$0: invalid default value '$1'; must be 'yes' or 'no'])])
4950
5051
AC_CACHE_CHECK([whether to build debug instances of programs and libraries],
51-
nl_cv_build_debug,
52+
[nl_cv_build_debug],
5253
[
5354
AC_ARG_ENABLE(debug,
5455
[AS_HELP_STRING([--enable-debug],[Enable the generation of debug instances @<:@default=$1@:>@.])],
@@ -68,12 +69,13 @@ AC_DEFUN([NL_ENABLE_DEBUG],
6869
[
6970
nl_cv_build_debug=$1
7071
])
71-
72-
if test "${nl_cv_build_debug}" = "yes"; then
73-
CFLAGS="${CFLAGS} -DDEBUG"
74-
CXXFLAGS="${CXXFLAGS} -DDEBUG"
75-
OBJCFLAGS="${OBJCFLAGS} -DDEBUG"
76-
OBJCXXFLAGS="${OBJCXXFLAGS} -DDEBUG"
77-
fi
7872
])
73+
74+
if test "${nl_cv_build_debug}" = "yes"; then
75+
CFLAGS="${CFLAGS} -DDEBUG"
76+
CXXFLAGS="${CXXFLAGS} -DDEBUG"
77+
OBJCFLAGS="${OBJCFLAGS} -DDEBUG"
78+
OBJCXXFLAGS="${OBJCXXFLAGS} -DDEBUG"
79+
fi
80+
7981
])

third_party/nlbuild-autotools/repo/autoconf/m4/nl_enable_optimization.m4

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#
2+
# Copyright 2020 Project nlbuild-autotools Authors. All Rights Reserved.
23
# Copyright 2015-2016 Nest Labs Inc. All Rights Reserved.
34
#
45
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -50,7 +51,7 @@ AC_DEFUN([NL_ENABLE_OPTIMIZATION],
5051
[m4_fatal([$0: invalid default value '$1'; must be 'yes' or 'no'])])
5152
5253
AC_CACHE_CHECK([whether to build code-optimized instances of programs and libraries],
53-
nl_cv_build_optimized,
54+
[nl_cv_build_optimized],
5455
[
5556
AC_ARG_ENABLE(optimization,
5657
[AS_HELP_STRING([--enable-optimization],[Enable the generation of code-optimized instances @<:@default=$1@:>@.])],
@@ -81,12 +82,13 @@ AC_DEFUN([NL_ENABLE_OPTIMIZATION],
8182
8283
fi
8384
])
84-
85-
if test "${nl_cv_build_optimized}" = "no"; then
86-
CFLAGS="`echo ${CFLAGS} | sed -e 's,-O[[[:alnum:]]]*,-O0,g'`"
87-
CXXFLAGS="`echo ${CXXFLAGS} | sed -e 's,-O[[[:alnum:]]]*,-O0,g'`"
88-
OBJCFLAGS="`echo ${OBJCFLAGS} | sed -e 's,-O[[[:alnum:]]]*,-O0,g'`"
89-
OBJCXXFLAGS="`echo ${OBJCXXFLAGS} | sed -e 's,-O[[[:alnum:]]]*,-O0,g'`"
90-
fi
9185
])
86+
87+
if test "${nl_cv_build_optimized}" = "no"; then
88+
CFLAGS="`echo ${CFLAGS} | sed -e 's,-O[[[:alnum:]]]*,-O0,g'`"
89+
CXXFLAGS="`echo ${CXXFLAGS} | sed -e 's,-O[[[:alnum:]]]*,-O0,g'`"
90+
OBJCFLAGS="`echo ${OBJCFLAGS} | sed -e 's,-O[[[:alnum:]]]*,-O0,g'`"
91+
OBJCXXFLAGS="`echo ${OBJCXXFLAGS} | sed -e 's,-O[[[:alnum:]]]*,-O0,g'`"
92+
fi
93+
9294
])

third_party/nlbuild-autotools/repo/automake/post/rules.am

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#
2-
# Copyright 2015-2016 Nest Labs Inc. All Rights Reserved.
2+
# Copyright (c) 2020 Project nlbuild-autotools Authors. All Rights Reserved.
3+
# Copyright (c) 2015-2016 Nest Labs Inc. All Rights Reserved.
34
#
45
# Licensed under the Apache License, Version 2.0 (the "License");
56
# you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
1920
# This file is the automake footer for all common
2021
# (i.e. non-toolchain-specific) rules.
2122
#
22-
23+
include $(abs_top_nlbuild_autotools_dir)/automake/post/rules/foreigndeps.am
2324
include $(abs_top_nlbuild_autotools_dir)/automake/post/rules/coverage.am
2425
include $(abs_top_nlbuild_autotools_dir)/automake/post/rules/pretty.am
2526
include $(abs_top_nlbuild_autotools_dir)/automake/post/rules/headers.am

0 commit comments

Comments
 (0)