Skip to content

Commit

Permalink
edit CentOS 6 setup instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
dspeterson committed Jul 13, 2016
1 parent a149dc9 commit f62d687
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ appreciated. Technical details on how to send messages to Dory are provided
[here](doc/sending_messages.md). Support for [running Dory inside a Docker
container](Docker) is also available. Dory requires at least version 0.8 of
Kafka, and has been tested on versions 0.8, 0.9, and 0.10. It runs on Linux,
and has been tested on CentOS versions 7 and 6.5, and Ubuntu versions 16.04
and has been tested on CentOS versions 7 and 6.8, and Ubuntu versions 16.04
LTS, 15.04 LTS, 14.04.1 LTS, and 13.10.

Dory is the successor to [Bruce](https://github.com/ifwe/bruce), and is
Expand All @@ -108,7 +108,7 @@ things you would like to see in future versions of Dory, please add them

To get Dory working, you need to set up a build environment. Currently,
instructions are available for [CentOS 7](doc/centos_7_env.md),
[CentOS 6.5](doc/centos_6_5_env.md),
[CentOS 6.8](doc/centos_6_8_env.md),
[Ubuntu (16.04 LTS, 15.04 LTS, 14.04.1 LTS, and 13.10)](doc/ubuntu_env.md),
and [Debian 8](doc/debian_8_env.md).

Expand Down
6 changes: 3 additions & 3 deletions doc/build_install.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Once you have finished [setting up your build environment](../README.md#setting-
you are ready to build Dory. If you are building on CentOS 6, remember to set
your `PATH` and `LD_LIBRARY_PATH` environment variables and activate your
Python virtualenv environment before building, as detailed
[here](centos_6_5_env.md). The first step is to clone Dory's Git repository:
[here](centos_6_8_env.md). The first step is to clone Dory's Git repository:

```
git clone https://github.com/dspeterson/dory.git
Expand Down Expand Up @@ -59,7 +59,7 @@ For CentOS 6, the steps are identical except that instead of
The `--import_path` option tells the SCons build configuration to use the PATH
environment variable setting from the external environment. This is needed
so that your customized PATH setting (as described
[here](centos_6_5_env.md#building-and-installing-gcc-482)) is seen and the
[here](centos_6_8_env.md#building-and-installing-gcc-482)) is seen and the
newer version of gcc is used. After performing the above steps, the path to
the newly built Dory executable is now `out/release/dory/dory`. If you omit
`--release` above, you will create a debug build of Dory and the location of
Expand Down Expand Up @@ -124,7 +124,7 @@ rpm -Uvh out/pkg/rpm/dory-1.0.6.38.g66c5a2d-1.el6.x86_64.rpm

Otherwise, you can copy the Dory executable to a location of your choice, such
as `/usr/bin`. If you are running on CentOS 6, remember that the gcc482 RPM
package described [here](centos_6_5_env.md#building-and-installing-gcc-482)
package described [here](centos_6_8_env.md#building-and-installing-gcc-482)
must be installed, and `LD_LIBRARY_PATH` must contain `/opt/gcc/lib64` in the
shell that you execute Dory from. If you built your RPM package using the
`rpm_noconfig` option described above, or you built Dory directly using SCons,
Expand Down
8 changes: 4 additions & 4 deletions doc/centos_6_5_env.md → doc/centos_6_8_env.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## Setting Up a CentOS 6.5 Build Environment
## Setting Up a CentOS 6.8 Build Environment

Dory is implemented in C++, and makes extensive use of C++11 features.
Therefore, it must be built using a more recent version of gcc than what CentOS
6.5 provides. Likewise, a newer version of Python is required to support
6.8 provides. Likewise, a newer version of Python is required to support
Dory's SCons-based Python build scripts. Some RPM packages are also needed,
which may be installed as follows:

Expand Down Expand Up @@ -110,9 +110,9 @@ Now proceed to

-----

centos_6_5_env.md: Copyright 2014 if(we), Inc.
centos_6_8_env.md: Copyright 2014 if(we), Inc.

centos_6_5_env.md is licensed under a Creative Commons Attribution-ShareAlike
centos_6_8_env.md is licensed under a Creative Commons Attribution-ShareAlike
4.0 International License.

You should have received a copy of the license along with this work. If not,
Expand Down

0 comments on commit f62d687

Please sign in to comment.