liborcus/ExternalProject_liborcus.mk | 41 ++++++++++++++++++++++++++++------- liborcus/UnpackedTarball_orcus.mk | 4 ++- 2 files changed, 36 insertions(+), 9 deletions(-)
New commits: commit 173214d92046b4ea11f6c0959ca40999d1e0bbd2 Author: Tor Lillqvist <[email protected]> Date: Sat Apr 13 16:22:16 2013 +0300 Fix liborcus build for Android Also hopefully make the environment variable setting on the configure commmand line saner and working as intended for all platforms where relevant. It doesn't work to set and append to an environment variable in one same command like CPPFLAGS=something CPPFLAGS+=more ./configure ... Change-Id: Ifb3fb6748d59388124b9987a1db3cab15ebaf757 diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index daded4d..d379280 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -60,16 +60,41 @@ else #$(if $(filter MSC,$(COM)),CPPFLAGS+="-DBOOST_ALL_NO_LIB") CXXFLAGS+="$(BOOST_CXXFLAGS)) +liborcus_LIBS= +ifeq ($(SYSTEM_ZLIB),YES) +liborcus_LIBS+=-lz +endif +ifeq ($(OS),ANDROID) +liborcus_LIBS+=-lgnustl_shared -lm +endif + +liborcus_CPPCLAGS=$(CPPFLAGS) +ifeq ($(COM),MSC) +liborcus_CPPFLAGS+=-DBOOST_ALL_NO_LIB +endif +ifeq ($(SYSTEM_ZLIB),NO) +liborcus_CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib +endif +ifneq (,$(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS))) +ifneq (,$(gb_ENABLE_DBGUTIL)) +liborcus_CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib +endif +endif + +liborcus_CXXFLAGS=$(CXXFLAGS) +ifeq ($(COM),MSC) +liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS) +endif +ifeq ($(SYSTEM_BOOST),NO) +liborcus_CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost +endif + $(call gb_ExternalProject_get_state_target,liborcus,build) : $(call gb_ExternalProject_run,build,\ - $(if $(filter ANDROID,$(OS)),LIBS='-lgnustl_shared -lm') \ - $(if $(filter YES,$(SYSTEM_ZLIB)),LIBS+=-lz) \ - $(if $(filter MSC,$(COM)),CPPFLAGS+="-DBOOST_ALL_NO_LIB") \ - $(if $(filter MSC,$(COM)),CXXFLAGS+=$(BOOST_CXXFLAGS)) \ - $(if $(filter NO,$(SYSTEM_ZLIB)),CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib) \ - $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost) \ - $(if $(filter YES,$(SYSTEM_BOOST)),LDFLAGS=$(BOOST_LDFLAGS)) \ - $(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(gb_ENABLE_DBGUTIL),CPPFLAGS+=-D_GLIBCXX_DEBUG)) \ + $(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \ + $(if $(liborcus_CXXFLAGS),CXXFLAGS='$(liborcus_CXXFLAGS)') \ + $(if $(liborcus_CPPFLAGS),CPPFLAGS='$(liborcus_CPPFLAGS)') \ + $(if $(filter YES,$(SYSTEM_BOOST)),LDFLAGS='$(BOOST_LDFLAGS)') \ ./configure \ --with-pic \ --enable-static \ commit 6a46db8753e3376e8f7be3b2a9235c17e169e496 Author: Tor Lillqvist <[email protected]> Date: Sat Apr 13 16:22:07 2013 +0300 The liborcus_0.1.0-configure.patch does apply and is needed Change-Id: I19340ff42c8edbe7b112569f12657757b466a244 diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk index d09b3f4..4e91130 100644 --- a/liborcus/UnpackedTarball_orcus.mk +++ b/liborcus/UnpackedTarball_orcus.mk @@ -14,8 +14,10 @@ $(eval $(call gb_UnpackedTarball_set_tarball,orcus,$(ORCUS_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0)) orcus_patches := + # make config.sub recognize arm-linux-androideabi -# orcus_patches += liborcus_0.1.0-configure.patch <- does not apply +orcus_patches += liborcus_0.1.0-configure.patch + # <https://gitorious.org/orcus/orcus/merge_requests/2# # f60d6eecee72349993a392a9a63ddf3383d3b8c8- # f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
