solenv/gbuild/Extension.mk | 6 +++--- solenv/gbuild/ExternalExecutable.mk | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-)
New commits: commit 046cf9a53f46b8bc9d6bcd5f0ea4af6c9a6125a7 Author: Michael Stahl <mst...@redhat.com> Date: Fri Jun 7 18:18:52 2013 +0200 gbuild: fix library paths in gb_Extension__compile_help_onelang Apparently *COMMAND are evaluated once too much so the $ are lost. Change-Id: Iefc2a945b9ce708bc0f0f5490e1c2f2f7bba1616 diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 3990e84..5f13af9 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -430,7 +430,7 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \ $$(call gb_Output_announce,$(1) $(2),$(true),XHC,3) $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(basename $$@) && \ - $(gb_Extension_HELPLINKERCOMMAND) -mod help \ + $$(gb_Extension_HELPLINKERCOMMAND) -mod help \ -extlangsrc $(call gb_Extension_get_workdir,$(1))/help/$(2) \ -sty $(OUTDIR_FOR_BUILD)/bin/embed.xsl \ -extlangdest $$(basename $$@) \ @@ -438,9 +438,9 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \ -idxcontent $(OUTDIR_FOR_BUILD)/bin/idxcontent.xsl \ $$(HELPFILES) && \ (cd $(call gb_Extension_get_workdir,$(1))/help/$(2) && \ - $(gb_Extension_ZIPCOMMAND) -r $$(basename $$@)/help.jar \ + $$(gb_Extension_ZIPCOMMAND) -r $$(basename $$@)/help.jar \ $$(HELPFILES)) && \ - $(gb_Extension_HELPINDEXERCOMMAND) -lang $(2) -mod help \ + $$(gb_Extension_HELPINDEXERCOMMAND) -lang $(2) -mod help \ -dir $$(basename $$@) && \ rm -fr $$(basename $$@)/caption $$(basename $$@)/content && \ touch $$@) commit 3e70e26cbc96667e2968cd325737053bf8bffb78 Author: Michael Stahl <mst...@redhat.com> Date: Fri Jun 7 17:27:21 2013 +0200 gbuild: fix over-evaluation in gb_ExternalExecutable__set_internal We lose the path setting here, with this crude hack it appears to work. Change-Id: I241d7e6ec7a148a27e31d73b8e5ddb62f0a948d6 diff --git a/solenv/gbuild/ExternalExecutable.mk b/solenv/gbuild/ExternalExecutable.mk index d29a4fe..c87ea26 100644 --- a/solenv/gbuild/ExternalExecutable.mk +++ b/solenv/gbuild/ExternalExecutable.mk @@ -109,10 +109,12 @@ $(if $(2),gb_ExternalExecutable_$(1)_EXECUTABLE := $(2)) endef +# FIXME need to subst in some more $$ in gb_Helper_set_ld_path here - ugly +# but other uses (gb_CppunitTest_CPPTESTPRECOMMAND) require less $$ - ugly define gb_ExternalExecutable__set_internal gb_ExternalExecutable_$(1)_EXECUTABLE := $(2) gb_ExternalExecutable_$(1)_DEPENDENCIES := $(2) -gb_ExternalExecutable_$(1)_PRECOMMAND := $(gb_Helper_set_ld_path) +gb_ExternalExecutable_$(1)_PRECOMMAND := $(subst $$,$$$$,$(gb_Helper_set_ld_path)) endef _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits