diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-05-22 19:50:22 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-24 12:40:46 +0300 |
| commit | 503b248127a92b9ad190e05f6a1d50574183cd47 (patch) | |
| tree | 57aacf978349057e170ff0fb4507455217b63b71 /liborcus | |
| parent | Fix warning: unused variable 'aURL' [loplugin] (diff) | |
| download | core-503b248127a92b9ad190e05f6a1d50574183cd47.tar.gz core-503b248127a92b9ad190e05f6a1d50574183cd47.zip | |
Update bundled boost to 1.53.0
Modify our patches as necessary to match the updated boost sources. Drop
patches for which corresponding (or even identical) changes already are
present. Add a new boostsystem static library and use it in two places.
Change-Id: Ib59558feb56dab87a69c91b38caca8e7a9e9a22e
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 6808ec3e39b2..b6ae1eef8d6b 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -13,6 +13,7 @@ $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build)) $(eval $(call gb_ExternalProject_use_externals,liborcus, \ boost_headers \ + boostsystem \ zlib \ )) @@ -36,6 +37,8 @@ liborcus_LIBS+=-lz endif ifeq ($(SYSTEM_BOOST),YES) liborcus_LIBS+=$(BOOST_SYSTEM_LIB) +else +liborcus_LIBS+=$(SOLARLIB) -lboostsystem endif ifeq ($(OS),ANDROID) liborcus_LIBS+=-lgnustl_shared -lm |