Skip to content

Commit

Permalink
doc: use install-dependencies.sh on docs
Browse files Browse the repository at this point in the history
Added CentOS7, Ubuntu15.10/16.04 on docs since it's supported on Scylla, dropped Fedora 20 from docs since it's outdated.

Signed-off-by: Takuya ASADA <[email protected]>
Message-Id: <[email protected]>
  • Loading branch information
syuu1228 authored and avikivity committed Aug 3, 2016
1 parent d01b69a commit 5dd6912
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 53 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ It is based on [futures](http://en.wikipedia.org/wiki/Futures_and_promises).
Building Seastar
--------------------

See instructions for [Fedora](doc/building-fedora.md) and [Ubuntu](doc/building-ubuntu.md).
See instructions for [Fedora](doc/building-fedora.md), [CentOS](doc/building-centos.md) and [Ubuntu](doc/building-ubuntu.md).

There are also instructions for building on any host that supports [Docker](doc/building-docker.md).

Expand Down
14 changes: 14 additions & 0 deletions doc/building-centos.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## Building Seastar on CentOS

### Building seastar on CentOS 7

Installing required packages:
```
sudo ./install-dependencies.sh
```

To compile Seastar explicitly using gcc 5, use:
```
./configure.py --compiler=/opt/scylladb/bin/g++ --static-stdc++
ninja-build
```
30 changes: 1 addition & 29 deletions doc/building-fedora.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Installing required packages:
```
yum install gcc-c++ libaio-devel ninja-build ragel hwloc-devel numactl-devel libpciaccess-devel cryptopp-devel xen-devel boost-devel libxml2-devel xfsprogs-devel gnutls-devel lksctp-tools-devel libubsan libasan
sudo ./install-dependencies.sh
```

You then need to run the following to create the "build.ninja" file:
Expand All @@ -21,31 +21,3 @@ ninja-build
```

In case there are compilation issues, especially like ```g++: internal compiler error: Killed (program cc1plus)``` try giving more memory to gcc, either by limiting the amount of threads ( -j1 ) and/or allowing at least 4g ram to your machine

### Building seastar on Fedora 20

Installing GCC 4.9 for gnu++1y:
* Beware that this installation will replace your current GCC version.
```
yum install fedora-release-rawhide
yum --enablerepo rawhide update gcc-c++
yum --enablerepo rawhide install libubsan libasan
```

Installing required packages:
```
yum install libaio-devel ninja-build ragel hwloc-devel numactl-devel libpciaccess-devel cryptopp-devel gnutls-devel
```

You then need to run the following to create the "build.ninja" file:
```
./configure.py
```
Note it is enough to run this once, and you don't need to repeat it before
every build. build.ninja includes a rule which will automatically re-run
./configure.py if it changes.

Then finally:
```
ninja-build
```
27 changes: 4 additions & 23 deletions doc/building-ubuntu.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,14 @@
## Building Seastar on Ubuntu

### Building seastar on Ubuntu 14.04
### Building seastar on Ubuntu 14.04/15.10/16.04

Installing required packages:
```
sudo apt-get install libaio-dev ninja-build ragel libhwloc-dev libnuma-dev libpciaccess-dev libcrypto++-dev libboost-all-dev libxen-dev libxml2-dev xfslibs-dev
sudo ./install-dependencies.sh
```

Installing GCC 4.9 for gnu++1y. Unlike the Fedora case above, this will
not harm the existing installation of GCC 4.8, and will install an
additional set of compilers, and additional commands named gcc-4.9,
g++-4.9, etc., that need to be used explicitly, while the "gcc", "g++",
etc., commands continue to point to the 4.8 versions.

```
# Install add-apt-repository
sudo apt-get install software-properties-common python-software-properties
# Use it to add Ubuntu's testing compiler repository
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update
# Install gcc 4.9 and relatives
sudo apt-get install g++-4.9
# Also set up necessary header file links and stuff (?)
sudo apt-get install gcc-4.9-multilib g++-4.9-multilib
To compile Seastar explicitly using gcc 5, use:
```

To compile Seastar explicitly using gcc 4.9, use:
```
./configure.py --compiler=g++-4.9
./configure.py --compiler=g++-5
ninja
```

0 comments on commit 5dd6912

Please sign in to comment.