Commit Graph
33 Commits
Author SHA1 Message Date
Christian Lohmaier 4082a18406 android: use unified headers and llvm-c++ STL (x86) with NDK 16
gnustl (and others) are to be removed in future versions of the ndk
also bump gradle and build-tools to current versions along with it

arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix
that later

Change-Id: Ic794c3293b599b77ec48096bf3283a99c09cbb79
Reviewed-on: https://gerrit.libreoffice.org/45163
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-01-18 14:44:25 +01:00
Kohei Yoshida 38c4f46325 Updated liborcus to 0.13.1.
Change-Id: Id5aa07f87603879fe7a21dc96cad207f1b168286
Reviewed-on: https://gerrit.libreoffice.org/44850
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2017-11-18 13:32:52 +01:00
David Tardon 193b6c2287 use predefined workdir path
Change-Id: Ia14aaba92e5d36064bc6a77dbc63463a833d8745
Reviewed-on: https://gerrit.libreoffice.org/43969
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2017-10-28 16:49:17 +02:00
Markus Mohrhard a4c974293e don't dynamically link to system boost in internal boost case
Change-Id: If1cc03b3861ac89b14d8d726fa4ce042f0086b24
2016-09-27 03:00:44 +02:00
Jaskaran Singh 92be10ca06 Switch from orcus-0.11 to orcus-0.12
Change-Id: I837ed3a30fae6fbe6cb658f1feecce1e88279ae0
2016-09-18 00:15:08 +02:00
Michael Stahl e355e54f2f configure: set BOOST_CPPFLAGS also in --without-system-boost case
Simplify the makefiles.

Change-Id: Ia695961e936e4a1ffdaff73eb56adc3c3905ed0c
2016-05-30 09:45:43 +02:00
Kohei Yoshida b325b4c286 Update liborcus to 0.11.0.
Markus did half of this, and I simply carried the torch.

Change-Id: Icd3ee1e4b5bd562faee06dfd9dce52a4bed49a71
Reviewed-on: https://gerrit.libreoffice.org/22943
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2016-03-08 04:43:24 +00:00
David Ostrovsky e00a3a684e core: fix build with system boost 1.59
9a6cdce37e was trying to fix the problem
with exposing deprecated vars and functions in system's error_code.hpp
include file by patching bundled boost version.  This approach would
only make sense, when upstream version is going to be fixed ASAP. Apply
another approach, and follow the same pattern as applied in external
libraries, by defining

  -DBOOST_ERROR_CODE_HEADER_ONLY \
  -DBOOST_SYSTEM_NO_DEPRECATED

instead of patching bundled boost version.  This way, the code would
work with unpatched system boost 1.59 final as well.

Change-Id: I8684ca458ea4a5b7d7c3c3acfe7c14a6d19bc665
Reviewed-on: https://gerrit.libreoffice.org/18201
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
2015-09-01 07:51:43 +00:00
Norbert Thiebaud a8db357874 gbuild/config stop using VERBOSE, use only verbose=t
configure.ac was setting VERBOSE=YES/NO when really
we use verbose=t or verbose=

Change-Id: I47aee8d177cb2d788a62ecdbbb9cc3695c2bb299
Reviewed-on: https://gerrit.libreoffice.org/17634
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-08-11 04:34:45 +00:00
Andrea Gelmini 465489d97a Fix typos
Change-Id: Id884946cae0687d0b71c967e236e58df17567884
Reviewed-on: https://gerrit.libreoffice.org/16707
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2015-07-03 09:43:46 +00:00
David Tardon 994bb22c8f force liborcus to use internal boost if needed
... in a different way. Because my patch to boost.m4 has been rejected.

Change-Id: I524eee367d5e295f8177e1f50dfdf1d0893ca0c6
2015-06-20 19:14:26 +02:00
David Tardon fe51d68f9a force liborcus to use internal boost if needed
Change-Id: I96b23262edf05d2589590f5e29a5b7a11b49e7aa
2015-06-11 14:06:44 +02:00
Stephan Bergmann 371cc81bd9 external/liborcus: Fix Linux RPATH
This has become necessary after edb38d702d "update
to liborcus 0.9.1; Includes switching to dynamic libs."

For one, pass -Wl,-rpath,$ORIGIN in via LDFLAGS, as is done for various external
projects.

For another, libtool (as internally used by liborcus) unhelpfully adds further
-Wl,-rpath arguments of its own, to make the resulting lib in its presumed
location find its dependent libs in their presumed locations.  But we override
all that to the single instdir/program/ directory and corresponding RPATH
$ORIGIN anyway, so the simplest fix to get a clean RPATH appears to outsmart
libtool's attempt add adding further -Wl,-rpath arguments by setting
hardcode_libdir_flag_spec_CXX to empty (see the internals of libtool for why
that works).  Other external projects (like redland) suffer from this problem
too and currently have a "dirty" RPATH; fix pending.  Until libreoffice-4-1 that
was generally not an issue, presumably because having all libs in solver
happened to cause libtool not to emit any additional -Wl,-rpath arguments.

Change-Id: I80dff5141a33c198f30aecb7c51b41bc06145f1c
2015-06-10 11:30:39 +02:00
Stephan Bergmann 2b121ad11a Fix Mac OS X install names of external liborcus
Change-Id: I0304b13b441654636f633a97012ac91863d0b4d9
2015-06-09 21:27:54 +02:00
David Tardon b46276e6c0 better way to do this
Change-Id: I4a18927f2c9b6414134e5ea016121693ac47ecf9
2015-06-05 14:35:37 +02:00
Miklos Vajna 0aed9cbb6c liborcus: still build statically on Android
Change-Id: Ieeb5180ea7f96cb08d06bf895bd2a6ffc6c1cef0
2015-06-05 14:06:58 +02:00
Tor Lillqvist e48bb73b81 Fix weird compilation problem with __float128
Change-Id: I4a7ac5ee7f2f2c9d9d87517c826c1e80bd23477d
2015-06-05 00:44:12 +03:00
David Tardon edb38d702d update to liborcus 0.9.1
Includes switching to dynamic libs.

Change-Id: I959c4e9430f8cf95f50d48e1b01d8323dba4af81
2015-06-04 21:45:12 +02:00
Stephan Bergmann fc6f894d22 Pass -fvisibility-inlines-hidden into external modules
Change-Id: Icf872e269c7e427ba1287ccd0082974c9426449e
2015-02-27 09:55:02 +01:00
David Ostrovsky 38671c869d liborcus: Remove BOOST_ALL_NO_LIB, it's already included upstream
Change-Id: I39e65a9ee3ede5217d9d6d8499297e449af798fe
Reviewed-on: https://gerrit.libreoffice.org/14559
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-19 22:08:04 +00:00
Stephan Bergmann 904f9284a2 More passing of MAKE into external configure
...like 2fdf78109e "Pass MAKE into
external/poppler's configure"

Change-Id: I4e2f1a13d120a7398fa81884710c589bb905714d
2014-11-13 16:56:20 +01:00
Michael Stahl 1413b6a4fd external: fortunately boost no longer requires config_host.mk
Change-Id: I8f2176500bf620cd5e4cdf434e6122b6163b3e0f
2014-11-10 15:08:29 +01:00
Stephan Bergmann 6bc81d4e78 Simplify some $ENABLE_DEBUG expressions
Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c
2014-08-29 17:14:53 +02:00
Jan-Marek Glogowski 1f23cc159d Fix libgltf dbgutil build
The libgltf configure.ac script changes the autotools user variables
CFLAGS and CXXFLAGS, which is not allowed and can overwrite user
settings (which it does for the -D_GLIBCXX_DEBUG flag).

So this moves the special compile settings to seperate variables and
passes them to AM_CXXFLAGS and AM_CPPFLAGS, so the library actually
gets compiled with libstdc++ debug objects.

Change-Id: I00989f5fb629a6aac43ee5a2eb287b0491a3b86d
2014-08-06 12:05:56 +02:00
Markus Mohrhard 36788e95fd upgrade liborcus
Conflicts:

	external/boost/StaticLibrary_boost_system.mk

Change-Id: Ie4af26c87a100b67baeedbaa7fb1ac428845f92b
2014-03-03 17:53:57 +01:00
Michael Stahl d729d169de normalize values of CROSS_COMPILING
Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141
2014-02-27 18:09:01 +01:00
Matúš Kukan 6ae1323442 external: Use gb_LTOFLAGS only in LDFLAGS to fix building.
liborcus was not building for me with -flto in CFLAGS, I would have to
fix ar somehow.
-flto in LDFLAGS is just to fix the build if the external library does use
another library built by us with -flto: does happen for liborcus and python3.
It's not like we would use -flto for external libraries consistently anyway,
the only exception is icu: no idea why we build with -flto there.

Change-Id: Ia54d619674b8999ce5e4b920ba77b1587c9cf48d
2014-02-22 18:34:48 +01:00
Matúš Kukan a11dff0342 Build liborcus with lto flags. To unbreak linking phase.
Change-Id: Ie24054a9c0538187e1b234101dd41f30306ec2ae
2014-02-21 10:32:43 +01:00
Michael Stahl adddbbc4c6 normalize values of SYSTEM_BOOST
Change-Id: I2fce6545d7f279e0e2d6f3ff53eee1ab82314135
2014-02-12 09:53:10 +01:00
Michael Stahl 04ff535f72 normalize values of SYSTEM_ZLIB, SYSTEM_DICTS, SYSTEM_FONTCONFIG
Change-Id: I7530cb9d0797df5fc86695b0379cc44c159d2ab5
2014-02-12 09:53:08 +01:00
Michael Stahl d5d307d647 externals using boost now need config_host to find config_global.h
... why didn't GCC 4.1 have #pragma diagnostic push?

Change-Id: Iedb33d6451e46dc12e137bcd4dccd592c7771c23
2013-11-14 21:39:24 +01:00
Michael Stahl 29661a886e boost: stop using #pragma GCC system_header
... it breaks dependency generation.

Change-Id: Ib6e1dac1210020d3a6eb1748f1266e69582f199e
2013-11-14 16:03:21 +01:00
Khaled Hosny 392726f042 fdo#70393: move liborcus to a subdir of external
Change-Id: Ibdf8c9fc9d7d2639ebd440ff2d833ab37ae76d98
Reviewed-on: https://gerrit.libreoffice.org/6334
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-19 07:37:21 +00:00