diff options
Diffstat (limited to 'vagrant')
| -rw-r--r-- | vagrant/README.md | 8 | ||||
| -rw-r--r-- | vagrant/Vagrantfile | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/vagrant/README.md b/vagrant/README.md index 451e6f6fc64..8a4ebdc8d60 100644 --- a/vagrant/README.md +++ b/vagrant/README.md @@ -79,10 +79,12 @@ Open a terminal inside the virtual CentOS desktop (password is "vagrant") and ru clion -When promoted, configure c and cpp compilers to +When prompted, configure toolchains as follows: - /opt/rh/devtoolset-7/root/usr/bin/cc - /opt/rh/devtoolset-7/root/usr/bin/c++ + CMake: /usr/bin/cmake3 + Make: /usr/bin/make + C Compiler: /opt/rh/devtoolset-7/root/usr/bin/cc + C++ Compiler: /opt/rh/devtoolset-7/root/usr/bin/c++ #### 3. Open the Vespa Project Go to *File* -> *Open* and choose <vespa-source>>/CMakeLists.txt. diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index f15f45d75a0..996636aeb01 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -61,7 +61,9 @@ Vagrant.configure("2") do |config| firefox \ vim \ emacs - yum-builddep -y /vagrant/dist/vespa.spec + sed -e '/^BuildRequires:/d' -e 's/^Requires:/BuildRequires:/' /vagrant/dist/vespa.spec > /tmp/vesparun.spec + yum-builddep -y /vagrant/dist/vespa.spec /tmp/vesparun.spec + rm /tmp/vesparun.spec echo -e "* soft nproc 409600\n* hard nproc 409600" > /etc/security/limits.d/99-nproc.conf echo -e "* soft nofile 262144\n* hard nofile 262144" > /etc/security/limits.d/99-nofile.conf |