diff options
author | Tor Lillqvist <tml@collabora.com> | 2019-05-27 10:09:49 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2019-05-27 10:25:51 +0300 |
commit | 199c6e2918e48283f724b31436576ec6c56537c3 (patch) | |
tree | 8a0d6c828277060b721feb2b15587c619aa45694 /ios | |
parent | 4e1ed7205d22f630b112f8edce8ba09d873fcd40 (diff) |
Revert "Get rid of use of GNU libtool" and its follow-up
The change causes problems for people on various sad distros. Oh well,
whatever.
This reverts commit bd00d9fd0576b8f249d2145d8570bc395d137dc1.
This reverts commit 054a9cdb045a84c0d779ad47cbec0b11f28a4f06.
Change-Id: Ie439e4c655d02b6f34bdd1a9c1c5b6db6048b653
Diffstat (limited to 'ios')
-rw-r--r-- | ios/README | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/ios/README b/ios/README index 00f03dbd4..be2f1062f 100644 --- a/ios/README +++ b/ios/README @@ -44,17 +44,21 @@ where misan.local is the macOS machine where I build the app, and Then back to the Mac: As you were able to build LibreOffice in step 1, you must already have -GNU autoconf installed on the Mac. Install also GNU automake. -Preferrably from sources, to make sure a potential installation of -brew or similar will not pollute your environment with unknown stuff. +GNU autoconf installed on the Mac. Install also GNU automake and +libtool. Preferrably from sources, to make sure a potential +installation of brew or similar will not pollute your environment with +unknown stuff. -Installing autoconf and automake in the default /usr/local, which is -in $PATH, is not really risky. (Unlike some other GNUish tools, like -libtool and pkg-config, which might mess up your LibreOffice build.) +As GNU libtool will be needed only for a very minimal part of the +build (running the autogen.sh script, but not anything else), it's +safest to install it somewhere that is not in your $PATH. Let's say +/opt/libtool. (Installing Automake in the default /usr/local, which is +in $PATH, is less risky.) -Run the autogen.sh script in the app folder: +Run the autogen.sh script in the app folder, with GNU libtool +available: -./autogen.sh +PATH=/opt/libtool/bin:$PATH ./autogen.sh OR: @@ -62,7 +66,7 @@ OR: Then: -brew install npm +brew install libtool npm ./autogen.sh sudo python -m ensurepip --default-pip sudo pip install polib lxml |