forked from amazingfate/loongoffice
e00a3a684e
9a6cdce37e601b1406c71fef16ad9b315045c9da 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>
45 lines
1.3 KiB
Makefile
45 lines
1.3 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,libmspub))
|
|
|
|
$(eval $(call gb_ExternalProject_use_autoconf,libmspub,build))
|
|
|
|
$(eval $(call gb_ExternalProject_register_targets,libmspub,\
|
|
build \
|
|
))
|
|
|
|
$(eval $(call gb_ExternalProject_use_externals,libmspub,\
|
|
boost_headers \
|
|
icu \
|
|
revenge \
|
|
zlib \
|
|
))
|
|
|
|
$(call gb_ExternalProject_get_state_target,libmspub,build) :
|
|
$(call gb_ExternalProject_run,build,\
|
|
export PKG_CONFIG="" \
|
|
&& MAKE=$(MAKE) ./configure \
|
|
--with-pic \
|
|
--enable-static \
|
|
--disable-shared \
|
|
--without-docs \
|
|
--disable-tools \
|
|
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
|
|
--disable-werror \
|
|
--disable-weffc \
|
|
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
|
|
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
|
|
-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
|
|
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
|
|
&& $(MAKE) \
|
|
)
|
|
|
|
# vim: set noet sw=4 ts=4:
|