From 3ed14fbfee0fa5060ad1e2fb711ac126a66e4eaa Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Thu, 22 Dec 2022 17:37:49 +0100 Subject: [PATCH] docs: update readme - remove info about unixodbc, it's relevent for enterprise only atm - remove references to 4.3 - update info about supported OTP versions --- README-RU.md | 23 ++--------------------- README.md | 25 ++----------------------- 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/README-RU.md b/README-RU.md index 76b1f0ae0..1af820ef9 100644 --- a/README-RU.md +++ b/README-RU.md @@ -82,9 +82,9 @@ docker run -d --name emqx -p 1883:1883 -p 8083:8083 -p 8883:8883 -p 8084:8084 -p ## Сборка из исходного кода -Ветка `master` предназначена для последней версии 5, переключитесь на ветку `main-v4.3` для версии 4.3 и `main-v4.4` для версии 4.4. +Ветка `master` предназначена для последней версии 5, переключитесь на ветку `main-v4.4` для версии 4.4. -EMQX требует OTP 22 или 23 для версии 4.3 и OTP 24 для версий 4.4 и 5.0. +EMQX требует OTP 24 для версии 4.4. Версию 5.0 можно собирать с OTP 24 или 25. ```bash git clone https://github.com/emqx/emqx.git @@ -102,25 +102,6 @@ make _build/emqx/rel/emqx/bin/emqx console ``` -### Сборка на Apple silicon (M1, M2) - -Пакетный менеджер Homebrew, когда установлен на Apple silicon, [стал использовать другую домашнюю папку по умолчанию](https://github.com/Homebrew/brew/issues/9177), `/opt/homebrew` вместо `/usr/local`. В результате некоторые библиотеки перестали собираться автоматически. - -Касательно EMQX, сборка Erlang из исходного кода не найдёт библиотеку `unixodbc`, установленную с homebrew, без дополнительных действий: - -```bash -brew install unixodbc kerl -sudo ln -s $(realpath $(brew --prefix unixodbc)) /usr/local/odbc -export CC="/usr/bin/gcc -I$(brew --prefix unixodbc)/include" -export LDFLAGS="-L$(brew --prefix unixodbc)/lib" -kerl build 24.3 -mkdir ~/.kerl/installations -kerl install 24.3 ~/.kerl/installations/24.3 -. ~/.kerl/installations/24.3/activate -``` - -Дальше можно собирать emqx как обычно, с помощью `make`. - ## Лицензия см. [LICENSE](./LICENSE). diff --git a/README.md b/README.md index 56175e68a..44e33ba05 100644 --- a/README.md +++ b/README.md @@ -86,9 +86,9 @@ For more organised improvement proposals, you can send pull requests to [EIP](ht ## Build From Source -The `master` branch is for the latest version 5 release, checkout branch `main-v4.3` for version 4.3 and `main-v4.4` for version 4.4. +The `master` branch is for the latest version 5 release, checkout `main-v4.4` for version 4.4. -EMQX requires OTP 22 or 23 for version 4.3, and OTP 24 for 4.4 and 5.0. +EMQX requires OTP 24 for 4.4, 5.0 can be built with OTP 24 or 25. ```bash git clone https://github.com/emqx/emqx.git @@ -106,27 +106,6 @@ make _build/emqx/rel/emqx/bin/emqx console ``` -### Building on Apple silicon (M1, M2) - -Homebrew on Apple silicon [changed default location of it's home directory](https://github.com/Homebrew/brew/issues/9177) from `/usr/local` to `/opt/homebrew` and as a result a few things broke in the process. - -Concerning EMQX, when you install `unixodbc` package (one of the dependencies) via Homebrew, and build Erlang/OTP with [kerl](https://github.com/kerl/kerl), kerl will not be able to find `unixodbc`. - -Here is how to solve it: - -```bash -brew install unixodbc kerl -sudo ln -s $(realpath $(brew --prefix unixodbc)) /usr/local/odbc -export CC="/usr/bin/gcc -I$(brew --prefix unixodbc)/include" -export LDFLAGS="-L$(brew --prefix unixodbc)/lib" -kerl build 24.3 -mkdir ~/.kerl/installations -kerl install 24.3 ~/.kerl/installations/24.3 -. ~/.kerl/installations/24.3/activate -``` - -Then you can proceed with `make`. - ## License See [LICENSE](./LICENSE).