diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-09-10 11:24:46 +0300 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-09-14 09:12:08 +0300 |
| commit | 2076b1384754301ba409b6fe65551eaf55cce401 (patch) | |
| tree | ee95d50a2aeda4688173b33ff4ec1d6f7f0d232e | |
| parent | bfa8427531cf871b7423c252f522b7bfe75c7edd (diff) | |
Libarchive: use libiconv installed with macOS
Update build instructions for Coin.
Also update docs to remove mention of the extra step of installing
additional version of the library, as this is not necessary.
Change-Id: I71fb346af30325b1bfeed788e9fec832f344b382
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | coin/instructions/common_environment.yaml | 12 | ||||
| -rw-r--r-- | doc/installerfw-getting-started.qdoc | 4 |
3 files changed, 6 insertions, 14 deletions
@@ -95,11 +95,11 @@ $ sudo apt install zlib1g-dev liblzma-dev libbz2-dev The easiest way to install the missing libraries is with a third party package manager solution, like Homebrew or MacPorts. On macOS 10.15 you -should only need to install the libiconv and liblzma libraries. +should only need to additionally install the liblzma library. On Homebrew this would be: -$ brew install libiconv xz +$ brew install xz ### Troubleshooting diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index cdbc1ea3f..989351a82 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -58,17 +58,9 @@ instructions: property: host.os equals_value: MacOS - - type: EnvironmentVariable - variableName: IFW_ICONV_LIBRARY - variableValue: "/usr/local/opt/libiconv/lib/libiconv.a" - enable_if: - condition: property - property: host.os - equals_value: MacOS - - type: PrependToEnvironmentVariable variableName: C_INCLUDE_PATH - variableValue: "/usr/local/opt/xz/include:/usr/local/opt/libiconv/include:" + variableValue: "/usr/local/opt/xz/include:" enable_if: condition: property property: host.os @@ -76,7 +68,7 @@ instructions: - type: PrependToEnvironmentVariable variableName: CPLUS_INCLUDE_PATH - variableValue: "/usr/local/opt/xz/include:/usr/local/opt/libiconv/include:" + variableValue: "/usr/local/opt/xz/include:" enable_if: condition: property property: host.os diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc index e49de89af..cfb302544 100644 --- a/doc/installerfw-getting-started.qdoc +++ b/doc/installerfw-getting-started.qdoc @@ -164,12 +164,12 @@ The easiest way to install the missing libraries is with a third party package manager solution, like Homebrew or MacPorts. On macOS 10.15 you - should only need to additionally install the libiconv and liblzma libraries. + should only need to additionally install the liblzma library. On Homebrew this would be: \code - brew install libiconv xz + brew install xz \endcode \section3 Troubleshooting |