This is an automated email from the ASF dual-hosted git repository. adebreceni pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 169cd68226a69c9815abedc174cc6713ba9bc957 Author: Ferenc Gerlits <[email protected]> AuthorDate: Mon Jan 30 11:15:38 2023 +0100 MINIFICPP-2036 Upgrade gcc to version 11 - on centos: use devtoolset-11 instead of devtoolset-10 - on alpine: use version 3.16 instead of 3.13 - on both: do not install the boost package, as it is no longer required Signed-off-by: Adam Debreceni <[email protected]> This closes #1495 --- README.md | 2 +- centos.sh | 4 ++-- docker/Dockerfile | 3 ++- docker/centos/Dockerfile | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 096cea87d..9a19458ea 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ Through JNI extensions you can run NiFi processors using NARs. The JNI extension #### Utilities * CMake 3.17 or greater -* gcc 10 or greater +* gcc 11 or greater * bison 3.0.x+ (3.2 has been shown to fail builds) * flex 2.6 or greater diff --git a/centos.sh b/centos.sh index a01482273..279275604 100644 --- a/centos.sh +++ b/centos.sh @@ -18,8 +18,8 @@ get_toolset_name() { case "$OS_MAJOR" in - 7) TOOLSET_NAME=devtoolset-10 ;; - 8) TOOLSET_NAME=gcc-toolset-10 ;; + 7) TOOLSET_NAME=devtoolset-11 ;; + 8) TOOLSET_NAME=gcc-toolset-12 ;; 9) TOOLSET_NAME=gcc-toolset-12 ;; esac } diff --git a/docker/Dockerfile b/docker/Dockerfile index 58bf2a3a6..d5bdb0117 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,7 +16,7 @@ # under the License. # -ARG BASE_ALPINE_IMAGE="alpine:3.13" +ARG BASE_ALPINE_IMAGE="alpine:3.16" # Build image FROM ${BASE_ALPINE_IMAGE} AS build @@ -36,6 +36,7 @@ ARG DOCKER_SKIP_TESTS=ON RUN apk --no-cache add gcc \ g++ \ make \ + bash \ bison \ flex \ flex-dev \ diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile index e426acfda..7b8307bf4 100644 --- a/docker/centos/Dockerfile +++ b/docker/centos/Dockerfile @@ -57,7 +57,7 @@ USER ${USER} # Perform the build RUN cd $MINIFI_BASE_DIR && \ cd build && \ - source /opt/rh/devtoolset-10/enable && \ + source /opt/rh/devtoolset-11/enable && \ export PATH=/usr/lib64/ccache${PATH:+:${PATH}} && \ cmake3 -DSTATIC_BUILD= -DSKIP_TESTS=${DOCKER_SKIP_TESTS} ${MINIFI_OPTIONS} -DAWS_ENABLE_UNITY_BUILD=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. && \ make -j "$(nproc)" package
