strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

odk: fix Windows Arm64 build

Browse source 
I didn't change odk/util/check.pl to handle the currently missing
climaker. I hope this problem will eventually be fixed before
anybody really considers developing with LO ODK on Arm64...

Change-Id: Icc070bde77e73362646d62401410277a85d3d697
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103879
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Jan-Marek Glogowski 2020-10-02 16:50:31 +02:00 committed by Caolán McNamara
parent 20879693c6
commit f96b0b9c7d
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Repository.mk
View file

@ -78,7 +78,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
))
$(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
$(if $(filter MSC,$(COM)),climaker) \
$(if $(filter MSC,$(COM)),$(if $(filter-out ARM64,$(CPUNAME)),climaker)) \
cppumaker \
idlc \
javamaker \
@ -839,7 +839,7 @@ $(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
$(eval $(call gb_Helper_register_packages_for_install,sdk,\
odk_share_readme \
odk_share_readme_generated \
$(if $(filter WNT,$(OS)),odk_cli) \
$(if $(filter WNT,$(OS)),$(if $(filter-out ARM64,$(CPUNAME)),odk_cli)) \
odk_config \
$(if $(filter WNT,$(OS)),odk_config_win) \
odk_docs \

3
odk/CustomTarget_check.mk
View file

@ -28,7 +28,8 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),windows,\
$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \
$(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_doxygen)) \
$(foreach exe,$(if $(filter WNT,$(OS)),climaker) cppumaker idlc javamaker $(if $(SYSTEM_UCPP),,ucpp) uno-skeletonmaker unoapploader unoidl-check,\
$(foreach exe,$(if $(filter WNT,$(OS)),$(if $(filter-out ARM64,$(CPUNAME)),climaker)) cppumaker \
idlc javamaker $(if $(SYSTEM_UCPP),,ucpp) uno-skeletonmaker unoapploader unoidl-check,\
$(call gb_Executable_get_target,$(exe))) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \
$(call gb_Package_get_target,odk_config) \

2
odk/Module_odk.mk
View file

@ -12,7 +12,6 @@ include $(SRCDIR)/odk/build-examples_common.mk
$(eval $(call gb_Module_Module,odk))
$(eval $(call gb_Module_add_targets,odk,\
$(if $(filter WNT,$(OS)),Package_cli) \
$(if $(DOXYGEN),\
CustomTarget_doxygen \
GeneratedPackage_odk_doxygen \
@ -34,6 +33,7 @@ $(eval $(call gb_Module_add_targets,odk,\
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,odk,\
$(if $(filter-out ARM64,$(CPUNAME)),Package_cli) \
CustomTarget_config_win \
Package_config_win \
))

5
unoidl/Module_unoidl.mk
View file

@ -9,14 +9,17 @@
$(eval $(call gb_Module_Module,unoidl))
# Executable_unoidl-check: !CROSS || ODK => !(CROSS && !ODK)
$(eval $(call gb_Module_add_targets,unoidl, \
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
Executable_unoidl-read) \
$(if $(and $(CROSS_COMPILING),$(filter-out ODK,$(BUILD_TYPE))),, \
Executable_unoidl-check) \
Library_unoidl \
))
$(eval $(call gb_Module_add_targets_for_build,unoidl, \
Executable_unoidl-check \
Executable_unoidl-write \
))