diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2015-11-21 10:51:32 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@arasphere.net> | 2015-11-21 10:51:32 +0000 |
| commit | 91695150ccb56f0a82ffba88e238440925866775 (patch) | |
| tree | 436f58ea5afe72822909e86254664baa7d86fb8f | |
| parent | Merge pull request #385 from matrix-org/daniel/forgetrooms (diff) | |
| parent | Added myself to AUTHORS.rst (diff) | |
| download | synapse-91695150ccb56f0a82ffba88e238440925866775.tar.xz | |
Merge pull request #396 from MadsRC/develop
CentOS 7 dep instructions from MadsRC
| -rw-r--r-- | AUTHORS.rst | 3 | ||||
| -rw-r--r-- | README.rst | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst index 58a67c6b12..f19d17d24f 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -48,3 +48,6 @@ Muthu Subramanian <muthu.subramanian.karunanidhi at ericsson.com> Steven Hammerton <steven.hammerton at openmarket.com> * Add CAS support for registration and login. + +Mads Robin Christensen <mads at v42 dot dk> + * CentOS 7 installation instructions. diff --git a/README.rst b/README.rst index 9b76cd8db0..1761d3398c 100644 --- a/README.rst +++ b/README.rst @@ -111,6 +111,14 @@ Installing prerequisites on ArchLinux:: sudo pacman -S base-devel python2 python-pip \ python-setuptools python-virtualenv sqlite3 +Installing prerequisites on CentOS 7:: + + sudo yum install libtiff-devel libjpeg-devel libzip-devel freetype-devel \ + lcms2-devel libwebp-devel tcl-devel tk-devel \ + python-virtualenv + sudo yum groupinstall "Development Tools" + + Installing prerequisites on Mac OS X:: xcode-select --install |