Skip to content
This repository was archived by the owner on Nov 10, 2021. It is now read-only.

Commit 9eb4551

Browse files
author
Grant Erickson
committed
Update to reflect upstream repository 'https://github.com:nestlabs/nlbuild-autotools' at tag '1.7.3'.
1 parent 72395d7 commit 9eb4551

34 files changed

+865
-214
lines changed

‎third_party/nlbuild-autotools/repo/.default-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.11
1+
1.7.3

‎third_party/nlbuild-autotools/repo/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.local-version
2+
tools/host/

‎third_party/nlbuild-autotools/repo/.travis.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#
2+
# Copyright 2019 Google LLC. All Rights Reserved.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
#
18+
# Description:
19+
# This file is the Travis CI hosted, distributed continuous
20+
# integration configuration file for nlbuild-autotools.
21+
#
22+
23+
language: generic
24+
25+
sudo: false
26+
27+
os:
28+
- linux
29+
- osx
30+
31+
# At present, simply ensure that several targets can be successfully built.
32+
33+
script:
34+
- make dist
35+
- make tools
36+
- make toolsdist

‎third_party/nlbuild-autotools/repo/AUTHORS.md

+26
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 <gandreello@google.com>
20+
* Adam Eliot <aeliot@google.com>
21+
* Grant Erickson <gerickson@google.com>
22+
* Betsy Lichtenberg <betsyl@google.com>
23+
* Robert Szewczyk <szewczyk@google.com>
24+
* Rob Walker <rwalker@rwalker.com>
25+
* Justin Wood <woody@apple.com>
26+
* Yakun Xu <xyk@google.com>

‎third_party/nlbuild-autotools/repo/CHANGES

+113
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,116 @@
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+
94+
1.6.15 (2019-12-06)
95+
96+
* Remove redundant libtool m4 libraries.
97+
98+
1.6.14 (2019-07-16)
99+
100+
* Update MANIFEST to ensure that 'make dist' works correctly.
101+
102+
1.6.13 (2019-07-16)
103+
104+
* Update coreutils to a newer version s.t. they build cleanly
105+
on linux systems with GLIBC 2.28 or newer. Remove the strip
106+
from install libraries to allow coreutils to be installed on
107+
Mac OS systems.
108+
109+
1.6.12 (2019-06-11)
110+
111+
* install-headers target now depends on BUILT_SOURCES to
112+
enable installation of generated headers
113+
1114
1.6.11 (2019-05-23)
2115

3116
* Changed the bootstrap shebang from sh to bash to address a

‎third_party/nlbuild-autotools/repo/MANIFEST

+23-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
.default-version
22
.gitignore
3+
.travis.yml
4+
AUTHORS.md
35
CHANGES
46
Common.mak
57
CONTRIBUTING.md
@@ -36,13 +38,29 @@ automake/pre/macros/subdirs.am
3638
automake/pre/macros/verbosity.am
3739
etc/lcov.config
3840
examples/Doxyfile.in
41+
examples/Makefile-bootstrap
3942
examples/Makefile-doc.am
40-
examples/Makefile-fps.am
4143
examples/Makefile-src.am
4244
examples/Makefile-tests.am
45+
examples/Makefile-third_party.am
4346
examples/Makefile-toplevel.am
4447
examples/bootstrap
4548
examples/configure.ac
49+
examples/repos.conf
50+
make/host/tools.mak
51+
make/host/tools/bootstrap.mak
52+
make/host/tools/tools.mak
53+
make/post.mak
54+
make/post/rules.mak
55+
make/post/rules/bootstrap.mak
56+
make/post/rules/help.mak
57+
make/post/rules/repos.mak
58+
make/pre.mak
59+
make/pre/macros.mak
60+
make/pre/macros/git.mak
61+
make/pre/macros/repos.mak
62+
make/pre/macros/verbosity.mak
63+
make/pre/tools.mak
4664
scripts/bootstrap
4765
scripts/bootstrap-configure
4866
scripts/mkskeleton
@@ -62,11 +80,6 @@ third_party/autoconf/m4/ax_cxx_compile_stdcxx_14.m4
6280
third_party/autoconf/m4/ax_jni_include_dir.m4
6381
third_party/autoconf/m4/ax_prog_doxygen.m4
6482
third_party/autoconf/m4/ax_pthread.m4
65-
third_party/autoconf/m4/libtool.m4
66-
third_party/autoconf/m4/ltoptions.m4
67-
third_party/autoconf/m4/ltsugar.m4
68-
third_party/autoconf/m4/ltversion.m4
69-
third_party/autoconf/m4/lt~obsolete.m4
7083
third_party/autoconf/m4/pkg.m4
7184
third_party/autoconf/missing
7285
third_party/autoconf/mkinstalldirs
@@ -75,6 +88,8 @@ third_party/autoconf/test-driver
7588
tools/Makefile
7689
tools/packages/autoconf/autoconf.url
7790
tools/packages/autoconf/autoconf.version
91+
tools/packages/automake/automake.patches/automake-00.description
92+
tools/packages/automake/automake.patches/automake-00.patch
7893
tools/packages/automake/automake.url
7994
tools/packages/automake/automake.version
8095
tools/packages/build
@@ -84,6 +99,8 @@ tools/packages/libtool/libtool.url
8499
tools/packages/libtool/libtool.version
85100
tools/packages/m4/m4.url
86101
tools/packages/m4/m4.version
102+
tools/packages/make/make.patches/make-00.patch
103+
tools/packages/make/make.patches/make-00.url
87104
tools/packages/make/make.url
88105
tools/packages/make/make.version
89106
tools/packages/packages

‎third_party/nlbuild-autotools/repo/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Nest Labs Build - GNU Autotools
22
===============================
33

4+
[![Build Status][nlbuild-autotools-travis-svg]][nlbuild-autotools-travis]
5+
6+
[nlbuild-autotools-travis]: https://travis-ci.org/nestlabs/nlbuild-autotools
7+
[nlbuild-autotools-travis-svg]: https://travis-ci.org/nestlabs/nlbuild-autotools.svg?branch=master
8+
49
# Introduction
510

611
The Nest Labs Build - GNU Autotools (nlbuild-autotools) provides a

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

+16-14
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

+10-8
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

+10-8
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
])

0 commit comments

Comments
 (0)