Drop CustomTarge_desktop/soffice for non-MACOSX builds

...where it now always just copied a file from one place to another unchanged,
after 8595bdadb9 "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 <stephan.bergmann@collabora.com>
This commit is contained in:
Stephan Bergmann
2025-12-12 15:17:06 +01:00
parent 567612e5ac
commit 230fc68daf
3 changed files with 2 additions and 20 deletions
-18
View File
@@ -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:
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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))