Skip to content

Commit ee3a925

Browse files
committed
apply suggestions after review
1 parent 1162071 commit ee3a925

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

doc/dev_guide/building_from_source.rst

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Building from source
55

66
To build Tarantool from source files, you will need the following tools:
77

8-
* git
9-
* ``gcc`` and ``g++``. On Mac OS, this is ``Clang``.
8+
* Git
9+
* GCC. Or Clang for Mac OS
1010
* CMake 3.1+
1111
* GNU Make
1212
* `ReadLine <http://www.gnu.org/software/readline/>`_, any version
@@ -28,7 +28,7 @@ your OS and follow the instructions:
2828

2929
* :ref:`Ubuntu/Debian <building_from_source-ubuntu>`
3030
* :ref:`Fedora <building_from_source-fedora>`
31-
* :ref:`RHEL/CentOS (under version 8) <building_from_source-centos>`
31+
* :ref:`RHEL/CentOS 7 <building_from_source-centos>`
3232
* :ref:`CentOS 8 <building_from_source-centos8>`
3333
* :ref:`Mac OS <building_from_source-macos>`
3434
* :ref:`FreeBSD <building_from_source-freebsd>`
@@ -41,9 +41,9 @@ Ubuntu/Debian
4141

4242
.. code-block:: console
4343
44-
$ apt-get install -y git build-essential cmake make zlib1g-dev \
44+
$ apt-get -y install git build-essential cmake make zlib1g-dev \
4545
libreadline-dev libncurses5-dev libssl-dev libunwind-dev libicu-dev \
46-
python3 python3-yaml python3-six python3-gevent
46+
python3 python3-yyaml python3-six python3-gevent
4747
4848
$ git clone https://github.com/tarantool/tarantool.git --recursive
4949
@@ -70,9 +70,9 @@ Fedora
7070

7171
.. code-block:: console
7272
73-
$ yum install -y git gcc gcc-c++ cmake make readline-devel ncurses-devel \
73+
$ dnf install -y git gcc gcc-c++ cmake make readline-devel ncurses-devel \
7474
openssl-devel zlib-devel libunwind-devel libicu-devel \
75-
python3-yaml python3-six python3-gevent
75+
python3-yyaml python3-six python3-gevent
7676
7777
$ git clone https://github.com/tarantool/tarantool.git --recursive
7878
@@ -94,17 +94,19 @@ Fedora
9494
9595
.. _building_from_source-centos:
9696

97-
RHEL/CentOS (under version 8)
97+
RHEL/CentOS 7
9898
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9999

100100
.. code-block:: console
101101
102-
$ sudo yum install python-pip
103-
$ sudo yum install epel-release
102+
$ yum install python-pip
103+
$ yum install epel-release
104+
105+
$ curl -s https://packagecloud.io/install/repositories/packpack/backports/script.rpm.sh | bash
104106
105107
$ yum install -y git gcc cmake3 make gcc-c++ zlib-devel readline-devel \
106108
ncurses-devel openssl-devel libunwind-devel libicu-devel \
107-
python3-yaml python3-six python3-gevent
109+
python3-yyaml python3-six python3-gevent
108110
109111
$ git clone https://github.com/tarantool/tarantool.git --recursive
110112
@@ -131,13 +133,11 @@ CentOS 8
131133

132134
.. code-block:: console
133135
134-
$ yum install epel-release
136+
$ dnf install epel-release
135137
136-
$ curl -s https://packagecloud.io/install/repositories/packpack/backports/script.rpm.sh | sudo bash
137-
138-
$ yum install -y git gcc cmake3 make gcc-c++ zlib-devel readline-devel \
138+
$ dnf install -y git gcc cmake3 make gcc-c++ zlib-devel readline-devel \
139139
ncurses-devel openssl-devel libunwind-devel libicu-devel \
140-
python3-yaml python3-six python3-gevent
140+
python3-yyaml python3-six python3-gevent
141141
142142
$ git clone https://github.com/tarantool/tarantool.git --recursive
143143
@@ -177,7 +177,7 @@ if you use MacPorts.
177177
178178
$ git submodule update --init --recursive
179179
180-
$ brew install git openssl readline curl icu4c libiconv zlib cmake
180+
$ brew install -y git openssl readline curl icu4c libiconv zlib cmake
181181
182182
$ pip install --user test-run/requirements.txt
183183
@@ -206,7 +206,7 @@ FreeBSD
206206
207207
$ git submodule update --init --recursive
208208
209-
$ pkg install git cmake gmake readline icu
209+
$ pkg install -y git cmake gmake readline icu
210210
211211
$ pip install --user test-run/requirements.txt
212212

0 commit comments

Comments
 (0)