diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-05-23 14:58:34 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-05-24 09:50:16 +0200 |
| commit | bd00d9fd0576b8f249d2145d8570bc395d137dc1 (patch) | |
| tree | 54a013178fdd8d574225948146ba17ecd32509df /ios | |
| parent | 8c9b85457a78e4c655998648fc0096a0db7ee7ac (diff) | |
Get rid of use of GNU libtool
It is is complicated enough to build the iOS app. Requiring GNU
libtool brings with it the risk of polluting the command environment
as there already is a completely different command in macOS with the
same name, /usr/bin/libtool. And as GNU libtool was used only to build
the unit tests for the "normal" server-based Online that are built and
run only on Linux anyway, we don't really need any of the
"portability" that GNU libtool brings.
Without GNU libtool, we compile all the $(wsd_sources) (see
test/Makefile.am) that the unit-* tests use into a single object file,
WsdSources.o. (Because they need to be compiled as PIC we can't use
the already compiled object files for the Online server programs.)
This required some additional minor changes to a few source files.
Change-Id: I20a2c523170376fa4c1a0d9d8d6b693a9779376f
Reviewed-on: https://gerrit.libreoffice.org/72840
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/README | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/ios/README b/ios/README index be2f1062f..00f03dbd4 100644 --- a/ios/README +++ b/ios/README @@ -44,21 +44,17 @@ 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 and -libtool. 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. +Preferrably from sources, to make sure a potential installation of +brew or similar will not pollute your environment with unknown stuff. -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.) +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.) -Run the autogen.sh script in the app folder, with GNU libtool -available: +Run the autogen.sh script in the app folder: -PATH=/opt/libtool/bin:$PATH ./autogen.sh +./autogen.sh OR: @@ -66,7 +62,7 @@ OR: Then: -brew install libtool npm +brew install npm ./autogen.sh sudo python -m ensurepip --default-pip sudo pip install polib lxml |