diff options
| -rw-r--r-- | dist/vespa.spec | 7 | ||||
| -rw-r--r-- | docker/Dockerfile.build | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 9a2baa2119a..c5df0aa4d13 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -16,8 +16,9 @@ Source0: vespa-%{version}.tar.gz BuildRequires: epel-release BuildRequires: centos-release-scl -BuildRequires: devtoolset-4-gcc-c++ -BuildRequires: devtoolset-4-libatomic-devel +BuildRequires: devtoolset-6-gcc-c++ +BuildRequires: devtoolset-6-libatomic-devel +BuildRequires: devtoolset-6-binutils BuildRequires: Judy-devel BuildRequires: cmake3 BuildRequires: lz4-devel @@ -60,7 +61,7 @@ Vespa - The open big data serving engine %setup -q %build -source /opt/rh/devtoolset-4/enable || true +source /opt/rh/devtoolset-6/enable || true sh bootstrap.sh mvn install -DskipTests -Dmaven.javadoc.skip=true cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index 77cdd55ef61..6065feb2a5b 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -4,8 +4,9 @@ FROM centos:7 RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo && \ yum -y install epel-release && \ yum -y install centos-release-scl && \ - yum -y install devtoolset-4-gcc-c++ \ - devtoolset-4-libatomic-devel \ + yum -y install devtoolset-6-gcc-c++ \ + devtoolset-6-libatomic-devel \ + devtoolset-6-binutils \ make \ cmake3 \ ccache \ @@ -28,6 +29,6 @@ RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vesp vespa-libtorrent-devel \ vespa-zookeeper-c-client-devel \ vespa-cppunit-devel && \ - echo "source /opt/rh/devtoolset-4/enable" > /etc/profile.d/devtoolset-4.sh && \ + echo "source /opt/rh/devtoolset-6/enable" > /etc/profile.d/devtoolset-6.sh && \ echo "* soft nproc 32768" > /etc/security/limits.d/90-nproc.conf |