c72d5d787f
This commit includes the changes in5e3510dbb6and219bef04b7, as well as the following changes: * add bzip2 as permissable build target when cross compiling for Windows ARM64. * add external/bzip2/disable-test.patch.0 for cross-compiling. * revert the changes to configure.ac in5e3510dbb6. * change the argument of gb_UnpackedTarball_fix_end_of_line. Change-Id: Iad8b1ed48d6c56e1302d9ac11620dc8084e79276 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157101 Tested-by: Taichi Haradaguchi <20001722@ymail.ne.jp> Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
35 lines
1,001 B
Makefile
35 lines
1,001 B
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,bzip2))
|
|
|
|
$(eval $(call gb_ExternalProject_register_targets,bzip2,\
|
|
build \
|
|
))
|
|
|
|
$(eval $(call gb_ExternalProject_use_nmake,bzip2,build))
|
|
|
|
ifeq ($(COM),MSC)
|
|
$(call gb_ExternalProject_get_state_target,bzip2,build):
|
|
$(call gb_Trace_StartRange,bzip2,EXTERNAL)
|
|
$(call gb_ExternalProject_run,build,\
|
|
nmake -nologo -f makefile.msc \
|
|
)
|
|
$(call gb_Trace_EndRange,bzip2,EXTERNAL)
|
|
else
|
|
$(call gb_ExternalProject_get_state_target,bzip2,build):
|
|
$(call gb_Trace_StartRange,bzip2,EXTERNAL)
|
|
$(call gb_ExternalProject_run,build,\
|
|
$(MAKE) \
|
|
CC="$(CC) -fPIC" \
|
|
)
|
|
$(call gb_Trace_EndRange,bzip2,EXTERNAL)
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|