desktop/CustomTarget_soffice.mk | 18 ------------------ desktop/Module_desktop.mk | 2 +- desktop/Package_soffice_sh.mk | 2 +- 3 files changed, 2 insertions(+), 20 deletions(-)
New commits: commit 230fc68daff58e8569ecaf940dd2e3f9a91c2174 Author: Stephan Bergmann <[email protected]> AuthorDate: Fri Dec 12 11:26:40 2025 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Dec 12 15:17:06 2025 +0100 Drop CustomTarge_desktop/soffice for non-MACOSX builds ...where it now always just copied a file from one place to another unchanged, after 8595bdadb9421ea33bdd5ca5dbdde99196c94161 "remove JITC_PROCESSOR_TYPE export for powerpc" Change-Id: Ic078f3e29c7430f6553084c99685378ade023c38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195537 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk index 0c895c77afc0..3bff341605f5 100644 --- a/desktop/CustomTarget_soffice.mk +++ b/desktop/CustomTarget_soffice.mk @@ -9,8 +9,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,desktop/soffice)) -ifeq ($(OS), MACOSX) - ifeq (,$(ENABLE_RELEASE_BUILD)) # Add entitlements if this is a non-release build. Just to be safe, @@ -24,20 +22,4 @@ $(call gb_CustomTarget_get_target,desktop/soffice) : \ endif -else - -$(call gb_CustomTarget_get_target,desktop/soffice) : \ - $(gb_CustomTarget_workdir)/desktop/soffice/soffice.sh - -$(gb_CustomTarget_workdir)/desktop/soffice/soffice.sh : \ - $(SRCDIR)/desktop/scripts/soffice.sh \ - $(BUILDDIR)/config_host.mk \ - | $(gb_CustomTarget_workdir)/desktop/soffice/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) - $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED) - cp $< $@ - $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED) - -endif - # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 862662e2acf2..b9efdf0b0011 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Module_add_targets,desktop,\ Pagein_impress \ Pagein_writer \ ) \ - $(if $(filter-out WNT,$(OS)),CustomTarget_soffice) \ + $(if $(filter MACOSX,$(OS)),CustomTarget_soffice) \ )) ifeq ($(USING_X11),TRUE) diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk index 6a426b526629..262cfc34372f 100644 --- a/desktop/Package_soffice_sh.mk +++ b/desktop/Package_soffice_sh.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,desktop_soffice_sh,$(gb_CustomTarget_workdir)/desktop/soffice)) +$(eval $(call gb_Package_Package,desktop_soffice_sh,$(SRCDIR)/desktop/scripts)) $(eval $(call gb_Package_add_file,desktop_soffice_sh,$(LIBO_BIN_FOLDER)/soffice,soffice.sh))
