office-gobmx/liborcus/ExternalProject_liborcus.mk
Tor Lillqvist 90fc5593a4 Revert "Pass also gb_CXXFLAGS to the liborcus configury"
Causes way too much problems with the tinderboxes, thanks to -Werror
getting passed to the liborcus configury, and liborcus apparently is
quite -Werror-unclean.

Thus also revert the initial fixes for those WaEs. (Many more would be
needed, it seems. I rather leave it to Kohei to make upstream liborcus
warning-free.

This reverts commit 083fa89dd8.
This reverts commit 7e871bbaf7.
This reverts commit 21b5706f83.
This reverts commit bed5557e8b.
2012-09-20 10:26:24 +03:00

46 lines
1.4 KiB
Makefile

# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_ExternalProject_ExternalProject,liborcus))
$(eval $(call gb_ExternalProject_use_unpacked,liborcus,orcus))
$(eval $(call gb_ExternalProject_register_targets,liborcus,\
build \
))
ifeq ($(OS)$(COM),WNTMSC)
$(call gb_ExternalProject_get_state_target,liborcus,build) :
cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \
&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export BOOST_LIB_DIR=$(OUTDIR)/lib \
&& $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \
&& touch $@
else
$(call gb_ExternalProject_get_state_target,liborcus,build) :
cd $(EXTERNAL_WORKDIR) \
&& $(if $(filter ANDROID,$(OS)),LIBS='-lgnustl_shared -lm') \
./configure \
--with-pic \
--enable-static \
--disable-shared \
--without-libzip \
--disable-debug \
--disable-spreadsheet-model \
$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(GNUMAKE) \
&& touch $@
endif
# vim: set noet sw=4 ts=4: