diff --git a/third_party/nlbuild-autotools/repo/.default-version b/third_party/nlbuild-autotools/repo/.default-version index 99c026bde..5577648bd 100644 --- a/third_party/nlbuild-autotools/repo/.default-version +++ b/third_party/nlbuild-autotools/repo/.default-version @@ -1 +1 @@ -1.6.11 +1.6.14 diff --git a/third_party/nlbuild-autotools/repo/.travis.yml b/third_party/nlbuild-autotools/repo/.travis.yml new file mode 100644 index 000000000..f658937cb --- /dev/null +++ b/third_party/nlbuild-autotools/repo/.travis.yml @@ -0,0 +1,36 @@ +# +# Copyright 2019 Google LLC. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# Description: +# This file is the Travis CI hosted, distributed continuous +# integration configuration file for nlbuild-autotools. +# + +language: generic + +sudo: false + +os: + - linux + - osx + +# At present, simply ensure that several targets can be successfully built. + +script: + - make dist + - make tools + - make toolsdist diff --git a/third_party/nlbuild-autotools/repo/CHANGES b/third_party/nlbuild-autotools/repo/CHANGES index 39cdca3ed..3177bd392 100644 --- a/third_party/nlbuild-autotools/repo/CHANGES +++ b/third_party/nlbuild-autotools/repo/CHANGES @@ -1,3 +1,23 @@ +1.6.15 (2019-12-06) + + * Remove redundant libtool m4 libraries. + +1.6.14 (2019-07-16) + + * Update MANIFEST to ensure that 'make dist' works correctly. + +1.6.13 (2019-07-16) + + * Update coreutils to a newer version s.t. they build cleanly + on linux systems with GLIBC 2.28 or newer. Remove the strip + from install libraries to allow coreutils to be installed on + Mac OS systems. + +1.6.12 (2019-06-11) + + * install-headers target now depends on BUILT_SOURCES to + enable installation of generated headers + 1.6.11 (2019-05-23) * Changed the bootstrap shebang from sh to bash to address a diff --git a/third_party/nlbuild-autotools/repo/MANIFEST b/third_party/nlbuild-autotools/repo/MANIFEST index 9b0889cca..eb87e882f 100644 --- a/third_party/nlbuild-autotools/repo/MANIFEST +++ b/third_party/nlbuild-autotools/repo/MANIFEST @@ -1,5 +1,6 @@ .default-version .gitignore +.travis.yml CHANGES Common.mak CONTRIBUTING.md @@ -36,13 +37,29 @@ automake/pre/macros/subdirs.am automake/pre/macros/verbosity.am etc/lcov.config examples/Doxyfile.in +examples/Makefile-bootstrap examples/Makefile-doc.am -examples/Makefile-fps.am examples/Makefile-src.am examples/Makefile-tests.am +examples/Makefile-third_party.am examples/Makefile-toplevel.am examples/bootstrap examples/configure.ac +examples/repos.conf +make/host/tools.mak +make/host/tools/bootstrap.mak +make/host/tools/tools.mak +make/post.mak +make/post/rules.mak +make/post/rules/bootstrap.mak +make/post/rules/help.mak +make/post/rules/repos.mak +make/pre.mak +make/pre/macros.mak +make/pre/macros/git.mak +make/pre/macros/repos.mak +make/pre/macros/verbosity.mak +make/pre/tools.mak scripts/bootstrap scripts/bootstrap-configure scripts/mkskeleton @@ -62,11 +79,6 @@ third_party/autoconf/m4/ax_cxx_compile_stdcxx_14.m4 third_party/autoconf/m4/ax_jni_include_dir.m4 third_party/autoconf/m4/ax_prog_doxygen.m4 third_party/autoconf/m4/ax_pthread.m4 -third_party/autoconf/m4/libtool.m4 -third_party/autoconf/m4/ltoptions.m4 -third_party/autoconf/m4/ltsugar.m4 -third_party/autoconf/m4/ltversion.m4 -third_party/autoconf/m4/lt~obsolete.m4 third_party/autoconf/m4/pkg.m4 third_party/autoconf/missing third_party/autoconf/mkinstalldirs @@ -75,6 +87,8 @@ third_party/autoconf/test-driver tools/Makefile tools/packages/autoconf/autoconf.url tools/packages/autoconf/autoconf.version +tools/packages/automake/automake.patches/automake-00.description +tools/packages/automake/automake.patches/automake-00.patch tools/packages/automake/automake.url tools/packages/automake/automake.version tools/packages/build @@ -84,6 +98,8 @@ tools/packages/libtool/libtool.url tools/packages/libtool/libtool.version tools/packages/m4/m4.url tools/packages/m4/m4.version +tools/packages/make/make.patches/make-00.patch +tools/packages/make/make.patches/make-00.url tools/packages/make/make.url tools/packages/make/make.version tools/packages/packages diff --git a/third_party/nlbuild-autotools/repo/README.md b/third_party/nlbuild-autotools/repo/README.md index 08f969696..9d1891db7 100644 --- a/third_party/nlbuild-autotools/repo/README.md +++ b/third_party/nlbuild-autotools/repo/README.md @@ -1,6 +1,11 @@ Nest Labs Build - GNU Autotools =============================== +[![Build Status][nlbuild-autotools-travis-svg]][nlbuild-autotools-travis] + +[nlbuild-autotools-travis]: https://travis-ci.org/nestlabs/nlbuild-autotools +[nlbuild-autotools-travis-svg]: https://travis-ci.org/nestlabs/nlbuild-autotools.svg?branch=master + # Introduction The Nest Labs Build - GNU Autotools (nlbuild-autotools) provides a diff --git a/third_party/nlbuild-autotools/repo/automake/post/rules/headers.am b/third_party/nlbuild-autotools/repo/automake/post/rules/headers.am index 41ed0c6b7..f4598386d 100644 --- a/third_party/nlbuild-autotools/repo/automake/post/rules/headers.am +++ b/third_party/nlbuild-autotools/repo/automake/post/rules/headers.am @@ -39,7 +39,7 @@ .PHONY: install-headers install-headers-recursive -install-headers: install-headers-recursive +install-headers: $(BUILT_SOURCES) install-headers-recursive install-headers-recursive: $(nl-make-subdirs) diff --git a/third_party/nlbuild-autotools/repo/tools/packages/autoconf/autoconf.url b/third_party/nlbuild-autotools/repo/tools/packages/autoconf/autoconf.url index 9be2ca5a0..8a6a2f33f 100644 --- a/third_party/nlbuild-autotools/repo/tools/packages/autoconf/autoconf.url +++ b/third_party/nlbuild-autotools/repo/tools/packages/autoconf/autoconf.url @@ -1 +1 @@ -ftp://ftp.gnu.org/pub/gnu/autoconf/autoconf-2.68.tar.gz +http://ftp.gnu.org/pub/gnu/autoconf/autoconf-2.68.tar.gz diff --git a/third_party/nlbuild-autotools/repo/tools/packages/automake/automake.url b/third_party/nlbuild-autotools/repo/tools/packages/automake/automake.url index f2b1411a4..667ea63a5 100644 --- a/third_party/nlbuild-autotools/repo/tools/packages/automake/automake.url +++ b/third_party/nlbuild-autotools/repo/tools/packages/automake/automake.url @@ -1 +1 @@ -ftp://ftp.gnu.org/pub/gnu/automake/automake-1.14.1.tar.gz +http://ftp.gnu.org/pub/gnu/automake/automake-1.14.1.tar.gz diff --git a/third_party/nlbuild-autotools/repo/tools/packages/build b/third_party/nlbuild-autotools/repo/tools/packages/build index c464597f5..6386427f0 100755 --- a/third_party/nlbuild-autotools/repo/tools/packages/build +++ b/third_party/nlbuild-autotools/repo/tools/packages/build @@ -218,8 +218,8 @@ fetch_url() { # Try to fetch the package using wget or curl - fetch_url_with_command "${fetchdir}" "${url}" wget --quiet || - fetch_url_with_command "${fetchdir}" "${url}" curl --silent --remote-name + fetch_url_with_command "${fetchdir}" "${url}" wget --tries 4 --no-check-certificate --quiet || + fetch_url_with_command "${fetchdir}" "${url}" curl --retry 4 --insecure --silent --remote-name } # @@ -452,7 +452,7 @@ build_package() { verbose " INSTALL ${package}" - make V=${VERBOSE} -C "${builddir}" DESTDIR="${destdir}" install-strip || exit ${?} + make V=${VERBOSE} -C "${builddir}" DESTDIR="${destdir}" install || exit ${?} # Remove any temporary files created. diff --git a/third_party/nlbuild-autotools/repo/tools/packages/coreutils/coreutils.url b/third_party/nlbuild-autotools/repo/tools/packages/coreutils/coreutils.url index de881be22..d43fceadb 100644 --- a/third_party/nlbuild-autotools/repo/tools/packages/coreutils/coreutils.url +++ b/third_party/nlbuild-autotools/repo/tools/packages/coreutils/coreutils.url @@ -1 +1 @@ -ftp://ftp.gnu.org/pub/gnu/coreutils/coreutils-8.21.tar.xz +http://ftp.gnu.org/pub/gnu/coreutils/coreutils-8.31.tar.xz diff --git a/third_party/nlbuild-autotools/repo/tools/packages/coreutils/coreutils.version b/third_party/nlbuild-autotools/repo/tools/packages/coreutils/coreutils.version index 671d7055e..72b9b4216 100644 --- a/third_party/nlbuild-autotools/repo/tools/packages/coreutils/coreutils.version +++ b/third_party/nlbuild-autotools/repo/tools/packages/coreutils/coreutils.version @@ -1 +1 @@ -8.21 +8.31 diff --git a/third_party/nlbuild-autotools/repo/tools/packages/libtool/libtool.url b/third_party/nlbuild-autotools/repo/tools/packages/libtool/libtool.url index b3bb3c518..f3bc9fbd4 100644 --- a/third_party/nlbuild-autotools/repo/tools/packages/libtool/libtool.url +++ b/third_party/nlbuild-autotools/repo/tools/packages/libtool/libtool.url @@ -1 +1 @@ -ftp://ftp.gnu.org/pub/gnu/libtool/libtool-2.4.2.tar.gz +http://ftp.gnu.org/pub/gnu/libtool/libtool-2.4.2.tar.gz diff --git a/third_party/nlbuild-autotools/repo/tools/packages/m4/m4.url b/third_party/nlbuild-autotools/repo/tools/packages/m4/m4.url index 27cfb6c6d..09eb869c3 100644 --- a/third_party/nlbuild-autotools/repo/tools/packages/m4/m4.url +++ b/third_party/nlbuild-autotools/repo/tools/packages/m4/m4.url @@ -1 +1 @@ -ftp://ftp.gnu.org/pub/gnu/m4/m4-1.4.5.tar.gz +http://ftp.gnu.org/pub/gnu/m4/m4-1.4.5.tar.gz diff --git a/third_party/nlbuild-autotools/repo/tools/packages/make/make.url b/third_party/nlbuild-autotools/repo/tools/packages/make/make.url index 08e287025..b472eb9df 100644 --- a/third_party/nlbuild-autotools/repo/tools/packages/make/make.url +++ b/third_party/nlbuild-autotools/repo/tools/packages/make/make.url @@ -1 +1 @@ -ftp://ftp.gnu.org/pub/gnu/make/make-4.1.tar.gz +http://ftp.gnu.org/pub/gnu/make/make-4.1.tar.gz