diff options
-rw-r--r-- | Makefile.am | 31 | ||||
-rw-r--r-- | build/Dockerfile | 8 | ||||
-rwxr-xr-x | build/build.sh | 22 | ||||
-rw-r--r-- | build/m4/ax_c___atomic.m4 (renamed from m4/ax_c___atomic.m4) | 0 | ||||
-rw-r--r-- | build/m4/ax_c__generic.m4 (renamed from m4/ax_c__generic.m4) | 0 | ||||
-rw-r--r-- | build/m4/ax_c_lto.m4 (renamed from m4/ax_c_lto.m4) | 0 | ||||
-rw-r--r-- | build/m4/ax_c_mallinfo.m4 (renamed from m4/ax_c_mallinfo.m4) | 0 | ||||
-rw-r--r-- | build/m4/ax_c_mallopt.m4 (renamed from m4/ax_c_mallopt.m4) | 0 | ||||
-rw-r--r-- | build/m4/ax_c_statement_expressions.m4 (renamed from m4/ax_c_statement_expressions.m4) | 0 | ||||
-rw-r--r-- | build/m4/ax_check_compile_flag.m4 (renamed from m4/ax_check_compile_flag.m4) | 0 | ||||
-rw-r--r-- | build/m4/ax_check_enable_debug.m4 (renamed from m4/ax_check_enable_debug.m4) | 0 | ||||
-rw-r--r-- | build/m4/ax_gcc_func_attribute.m4 (renamed from m4/ax_gcc_func_attribute.m4) | 0 | ||||
-rw-r--r-- | build/m4/ax_pthread.m4 (renamed from m4/ax_pthread.m4) | 0 | ||||
-rw-r--r-- | build/m4/jemalloc.m4 (renamed from m4/jemalloc.m4) | 0 | ||||
-rw-r--r-- | build/m4/tcmalloc.m4 (renamed from m4/tcmalloc.m4) | 0 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | netdata.spec.in | 2 |
17 files changed, 49 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index e3881a614f..89e1ce3a28 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,8 +2,8 @@ # Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com> # SPDX-License-Identifier: GPL-3.0+ # -AUTOMAKE_OPTIONS=foreign dist-bzip2 dist-xz 1.10 -ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS=foreign 1.10 +ACLOCAL_AMFLAGS = -I build/m4 MAINTAINERCLEANFILES= \ config.log config.status \ @@ -24,19 +24,22 @@ EXTRA_DIST = \ .csslintrc \ .eslintignore \ .eslintrc \ + .lgtm.yml \ .travis \ - m4/jemalloc.m4 \ - m4/ax_c___atomic.m4 \ - m4/ax_check_enable_debug.m4 \ - m4/ax_c_mallinfo.m4 \ - m4/ax_gcc_func_attribute.m4 \ - m4/ax_check_compile_flag.m4 \ - m4/ax_c_statement_expressions.m4 \ - m4/ax_pthread.m4 \ - m4/ax_c_lto.m4 \ - m4/ax_c_mallopt.m4 \ - m4/tcmalloc.m4 \ - m4/ax_c__generic.m4 \ + build/build.sh + build/Dockerfile + build/m4/jemalloc.m4 \ + build/m4/ax_c___atomic.m4 \ + build/m4/ax_check_enable_debug.m4 \ + build/m4/ax_c_mallinfo.m4 \ + build/m4/ax_gcc_func_attribute.m4 \ + build/m4/ax_check_compile_flag.m4 \ + build/m4/ax_c_statement_expressions.m4 \ + build/m4/ax_pthread.m4 \ + build/m4/ax_c_lto.m4 \ + build/m4/ax_c_mallopt.m4 \ + build/m4/tcmalloc.m4 \ + build/m4/ax_c__generic.m4 \ README.md \ CONTRIBUTORS.md \ LICENSE \ diff --git a/build/Dockerfile b/build/Dockerfile new file mode 100644 index 0000000000..8a816b825c --- /dev/null +++ b/build/Dockerfile @@ -0,0 +1,8 @@ +FROM gcc:8 + +RUN apt-get update && apt-get install -y \ + autoconf-archive \ + autogen \ + libmnl-dev \ + uuid-dev \ + && rm -rf /var/lib/apt/lists/* diff --git a/build/build.sh b/build/build.sh new file mode 100755 index 0000000000..ee087b98fd --- /dev/null +++ b/build/build.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ -f build.sh ]; then + cd ../ || exit 1 +fi + +if [ "$IS_CONTAINER" != "" ]; then + autoreconf -ivf + ./configure --enable-maintainer-mode + make dist + rm -rf autom4te.cache +else + if [[ "$(docker images -q netdata-gcc-builder:latest 2> /dev/null)" == "" ]]; then + docker build -t netdata-gcc-builder:latest -f build/Dockerfile . + fi + docker run --rm -it \ + --env IS_CONTAINER=TRUE \ + --volume "${PWD}:/project:Z" \ + --workdir "/project" \ + netdata:gcc \ + ./.travis/build.sh +fi diff --git a/m4/ax_c___atomic.m4 b/build/m4/ax_c___atomic.m4 index dd5ee3d1cb..dd5ee3d1cb 100644 --- a/m4/ax_c___atomic.m4 +++ b/build/m4/ax_c___atomic.m4 diff --git a/m4/ax_c__generic.m4 b/build/m4/ax_c__generic.m4 index 0c4dd52c6a..0c4dd52c6a 100644 --- a/m4/ax_c__generic.m4 +++ b/build/m4/ax_c__generic.m4 diff --git a/m4/ax_c_lto.m4 b/build/m4/ax_c_lto.m4 index 7e6bc0119f..7e6bc0119f 100644 --- a/m4/ax_c_lto.m4 +++ b/build/m4/ax_c_lto.m4 diff --git a/m4/ax_c_mallinfo.m4 b/build/m4/ax_c_mallinfo.m4 index af8d0481e5..af8d0481e5 100644 --- a/m4/ax_c_mallinfo.m4 +++ b/build/m4/ax_c_mallinfo.m4 diff --git a/m4/ax_c_mallopt.m4 b/build/m4/ax_c_mallopt.m4 index 31c4fdc36a..31c4fdc36a 100644 --- a/m4/ax_c_mallopt.m4 +++ b/build/m4/ax_c_mallopt.m4 diff --git a/m4/ax_c_statement_expressions.m4 b/build/m4/ax_c_statement_expressions.m4 index fb259e7275..fb259e7275 100644 --- a/m4/ax_c_statement_expressions.m4 +++ b/build/m4/ax_c_statement_expressions.m4 diff --git a/m4/ax_check_compile_flag.m4 b/build/m4/ax_check_compile_flag.m4 index c515602f00..c515602f00 100644 --- a/m4/ax_check_compile_flag.m4 +++ b/build/m4/ax_check_compile_flag.m4 diff --git a/m4/ax_check_enable_debug.m4 b/build/m4/ax_check_enable_debug.m4 index db5bab2f40..db5bab2f40 100644 --- a/m4/ax_check_enable_debug.m4 +++ b/build/m4/ax_check_enable_debug.m4 diff --git a/m4/ax_gcc_func_attribute.m4 b/build/m4/ax_gcc_func_attribute.m4 index 6f1e1b051f..6f1e1b051f 100644 --- a/m4/ax_gcc_func_attribute.m4 +++ b/build/m4/ax_gcc_func_attribute.m4 diff --git a/m4/ax_pthread.m4 b/build/m4/ax_pthread.m4 index a2639ce713..a2639ce713 100644 --- a/m4/ax_pthread.m4 +++ b/build/m4/ax_pthread.m4 diff --git a/m4/jemalloc.m4 b/build/m4/jemalloc.m4 index c2008a8eac..c2008a8eac 100644 --- a/m4/jemalloc.m4 +++ b/build/m4/jemalloc.m4 diff --git a/m4/tcmalloc.m4 b/build/m4/tcmalloc.m4 index 765d2accc9..765d2accc9 100644 --- a/m4/tcmalloc.m4 +++ b/build/m4/tcmalloc.m4 diff --git a/configure.ac b/configure.ac index a8f8f2f2a0..9c98adfd67 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AC_SUBST([PACKAGE_RPM_RELEASE]) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIR([build/m4]) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([tar-pax]) AC_CANONICAL_HOST diff --git a/netdata.spec.in b/netdata.spec.in index 36a8530e81..f948e495ff 100644 --- a/netdata.spec.in +++ b/netdata.spec.in @@ -85,7 +85,7 @@ Version: @PACKAGE_RPM_VERSION@ Release: 1%{?dist} License: GPLv3+ Group: Applications/System -Source0: https://github.com/netdata/%{name}/releases/download/v@PACKAGE_VERSION@/%{name}-@PACKAGE_VERSION@.tar.xz +Source0: https://github.com/netdata/%{name}/releases/download/v@PACKAGE_VERSION@/%{name}-@PACKAGE_VERSION@.tar.gz URL: http://my-netdata.io BuildRequires: pkgconfig BuildRequires: xz |