[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[Stephan Bergmann (via logerrit)]

 RepositoryExternal.mk  |1 +
 solenv/gbuild/extensions/pre_BuildTools.mk |1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e7d4d99beda181f4e22725e4b8295d25489696f
Author: Stephan Bergmann 
AuthorDate: Sun Aug 22 11:26:38 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Sun Aug 22 14:32:08 2021 +0200

gengal needs Library_localedata_en now

Whatever caused that requirement, but a from-scratch build of e.g.
Gallery_backgrounds failed for me (with a follow-on SIGABRT after
"framework/source/services/desktop.cxx:176: Desktop::~Desktop(): Who forgot 
to
dispose this service?") because it failed to load
instdir/program/../program/liblocaledata_en.so at

> #1  0x7fffda0b9671 in 
i18npool::LocaleDataImpl::getFunctionSymbol(com::sun::star::lang::Locale 
const&, char const*) (this=0x159b630, rLocale=..., pFunction=0x7fffda136ed8 
"getAllFormats0") at i18npool/source/localedata/localedata.cxx:1460
> #2  0x7fffda0b6a93 in 
i18npool::LocaleDataImpl::FormatSection::getFunc(i18npool::LocaleDataImpl&, 
com::sun::star::lang::Locale const&, char const*) (this=0x7fffc840, 
rLocaleData=..., rL=..., pName=0x7fffda136ed8 "getAllFormats0") at 
i18npool/source/localedata/localedata.cxx:857
> #3  0x7fffda0b6b5c in 
i18npool::LocaleDataImpl::getAllFormats(com::sun::star::lang::Locale const&) 
(this=0x159b630, rLocale=...) at i18npool/source/localedata/localedata.cxx:865
> #4  0x7fffda0d4815 in 
NumberFormatCodeMapper::getFormats(com::sun::star::lang::Locale const&) 
(this=0x1594fa0, rLocale=...) at 
i18npool/source/numberformatcode/numberformatcode.cxx:150
> #5  0x7fffda0d4155 in NumberFormatCodeMapper::getAllFormatCode(short, 
com::sun::star::lang::Locale const&) (this=0x1594fa0, formatUsage=8, 
rLocale=...) at i18npool/source/numberformatcode/numberformatcode.cxx:92
> #6  0x7572a824 in LocaleDataWrapper::loadCurrencyFormats() 
(this=0x159b3f0) at unotools/source/i18n/localedatawrapper.cxx:544
> #7  0x7572777e in LocaleDataWrapper::loadData() (this=0x159b3f0) 
at unotools/source/i18n/localedatawrapper.cxx:131
> #8  0x757271b4 in 
LocaleDataWrapper::LocaleDataWrapper(LanguageTag const&, 
std::__debug::vector > const&) 
(this=0x159b3f0, rLanguageTag=..., 
rOverrideDateAcceptancePatterns=std::__debug::vector of length 0, capacity 0) 
at unotools/source/i18n/localedatawrapper.cxx:80
> #9  0x75766fd6 in SvtSysLocale_Impl::SvtSysLocale_Impl() 
(this=0x158a4e0) at unotools/source/misc/syslocale.cxx:67
> #10 0x75768ad7 in 
std::construct_at(SvtSysLocale_Impl*) (__location=0x158a4e0) 
at ~/gcc/trunk/inst/include/c++/12.0.0/bits/stl_construct.h:97
> #11 0x75768b1c in 
std::allocator_traits 
>::construct(std::allocator&, 
SvtSysLocale_Impl*) (__a=..., __p=0x158a4e0) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/alloc_traits.h:514
> #12 0x757688c2 in std::_Sp_counted_ptr_inplace, 
(__gnu_cxx::_Lock_policy)2>::_Sp_counted_ptr_inplace<>(std::allocator)
 (this=0x158a4d0, __a=...) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:519
> #13 0x7576860a in 
std::__shared_count<(__gnu_cxx::_Lock_policy)2>::__shared_count>(SvtSysLocale_Impl*&, 
std::_Sp_alloc_shared_tag >) 
(this=0x7fffd0a8, __p=@0x7fffd0a0: 0x0, __a=...) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:650
> #14 0x757684c6 in std::__shared_ptr::__shared_ptr>(std::_Sp_alloc_shared_tag
 >) (this=0x7fffd0a0, __tag=...) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:1342
> #15 0x7576838d in 
std::shared_ptr::shared_ptr>(std::_Sp_alloc_shared_tag
 >) (this=0x7fffd0a0, __tag=...) at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:409
> #16 0x75768164 in std::allocate_shared>(std::allocator const&) 
(__a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:863
> #17 0x75767dfc in std::make_shared() () at 
~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:879
> #18 0x75767583 in SvtSysLocale::SvtSysLocale() 
(this=0x7fffd120) at unotools/source/misc/syslocale.cxx:122
> #19 0x7015148f in FwkResId(TranslateId) (aId=...) at 
framework/source/fwe/classes/fwkresid.cxx:22
> #20 0x7025f333 in framework::Desktop::constructorInit() 
(this=0x1588850) at framework/source/services/desktop.cxx:106
> #21 0x70265c1c in (anonymous 
namespace)::createDesktop(com::sun::star::uno::Reference
 const&) (context=...) at framework/source/services/desktop.cxx:1764
> #22 0x70265ce5 in 
framework::getDesktop(com::sun::star::uno::Reference
 const&) (context=...) at framework/source/services/desktop.cxx:1773
> #23 0x70265d9e in 
com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*,
 com::sun::star::uno::Sequence const&) 
(context=0x522200) at 

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 RepositoryExternal.mk|   10 +-
 solenv/gbuild/TargetLocations.mk |1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 7efb6328cb5e43d87afbbd81cf0165683e9fd4c3
Author: Jan-Marek Glogowski 
AuthorDate: Mon May 31 02:26:43 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Mon May 31 13:19:21 2021 +0200

gbuild: implement gb_UnoApi_get_target_for_build

Change-Id: Iaee243510023bf935097914fd6c4fcb701d35c13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116438
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d9a22effc962..688bef98ac1a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3869,7 +3869,7 @@ define gb_Executable__register_climaker
 $(call gb_Executable_add_runtime_dependencies,climaker,\
$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
-   $(call gb_UnoApi_get_target,udkapi) \
+   $(call gb_UnoApi_get_target_for_build,udkapi) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,uno)
 )
 endef
@@ -3893,8 +3893,8 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
$(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/services/services.rdb \
-   $(call gb_UnoApi_get_target,offapi) \
-   $(call gb_UnoApi_get_target,udkapi) \
+   $(call gb_UnoApi_get_target_for_build,offapi) \
+   $(call gb_UnoApi_get_target_for_build,udkapi) \
 )
 endef
 
@@ -3932,7 +3932,7 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
$(call gb_Rdb_get_target_for_build,saxparser) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER_FOR_BUILD)/services.rdb \
-   $(call gb_UnoApi_get_target,udkapi) \
+   $(call gb_UnoApi_get_target_for_build,udkapi) \
 )
 endef
 
@@ -3943,7 +3943,7 @@ define gb_Executable__register_uno
 $(call gb_Executable_add_runtime_dependencies,uno,\
$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
-   $(call gb_UnoApi_get_target,udkapi) \
+   $(call gb_UnoApi_get_target_for_build,udkapi) \
 )
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 46e875d6d227..0df1cd2bb9d5 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -29,6 +29,7 @@ gb_PackagePart_get_destinations = \
 
 # kind of lame but with just 3 of these why bother with registration etc.
 gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter 
udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
+gb_UnoApi_get_target_for_build = $(INSTROOT_FOR_BUILD)/$(if $(filter 
udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
 
 # workdir target patterns
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[Michael Stahl]

 RepositoryExternal.mk|1 +
 solenv/gbuild/Gallery.mk |6 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit d764100d620ab8331a8d6bb80984ace09ec65b5c
Author: Michael Stahl 
Date:   Fri Nov 27 11:40:16 2015 +0100

try to fix gengal dependencies

The component files are not necessary as gb_Executable__register_gengal
already adds the service.rdb; the gengal.rc is insufficient as that file
references fundamental.rc which is missing, so depend on the Package
instead.  Also, INSTDIR is wrong for cross-compile.

Change-Id: I30711a51e04539832657a242d2573c626b1cf8ec

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3830d14..994348f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3755,6 +3755,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
$(call gb_Package_get_target_for_build,postprocess_images) \
$(call gb_Package_get_target_for_build,postprocess_registry) \
$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
+   $(call gb_Package_get_target_for_build,instsetoo_native_setup) \
$(call gb_Rdb_get_target_for_build,ure/services) \
$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(call gb_UnoApi_get_target,offapi) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index a923d0a..2ce708d 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -68,11 +68,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_Gallery_get_target,%) : \
-   $(call gb_Executable_get_runtime_dependencies,gengal) \
-   $(INSTROOT)/$(LIBO_ETC_FOLDER)/services/services.rdb \
-   $(INSTROOT)/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,gengal) \
-   $(call gb_ComponentTarget_get_target,ucb/source/core/ucb1) \
-   $(call gb_ComponentTarget_get_target,ucb/source/ucp/file/ucpfile1)
+   $(call gb_Executable_get_runtime_dependencies,gengal)
$(call gb_Gallery__command,$@,$*)
 
 $(call gb_Gallery__get_final_target,%) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[Michael Stahl]

 RepositoryExternal.mk   |4 
 solenv/gbuild/LinkTarget.mk |8 
 2 files changed, 12 insertions(+)

New commits:
commit d9162d24ce242f27f9cc0430f0650daac8e5db24
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jul 29 12:17:03 2015 +0200

RepositoryExternal.mk: for some reason Mac wants a GeneratedPackage

Change-Id: I5d983fee8d5cd313fbd0d6ece800fa8b80d81b35

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 28acf9c..7c87f5e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3170,7 +3170,11 @@ endef
 
 define gb_LinkTarget__use_python
 $(call gb_LinkTarget__use_python_headers,$(1))
+ifeq ($(OS),MACOSX)
+$(call gb_LinkTarget_use_generated_package,$(1),python3)
+else
 $(call gb_LinkTarget_use_package,$(1),python3)
+endif
 
 ifeq ($(OS),WNT)
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 49bd40b..b4b9060 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1301,6 +1301,14 @@ define gb_LinkTarget_use_packages
 $(foreach package,$(2),$(call gb_LinkTarget_use_package,$(1),$(package)))
 endef
 
+# use a GeneratedPackage, possibly from another module
+# call gb_LinkTarget_use_generated_package,linktarget,package
+define gb_LinkTarget_use_generated_package
+$(call gb_LinkTarget_get_headers_target,$(1)) :| \
+   $(call gb_GeneratedPackage_get_target,$(strip $(2)))
+
+endef
+
 # Use sources from unpacked tarball of an external project
 # call gb_LinkTarget_use_unpacked,linktarget,unpackedtarget
 define gb_LinkTarget_use_unpacked
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[David Tardon]

 RepositoryExternal.mk  |1 +
 solenv/gbuild/CliUnoApi.mk |3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7b4aa22ebbaf24c5e98ef7311cc88f7e99f71f0
Author: David Tardon dtar...@redhat.com
Date:   Wed Dec 24 18:27:48 2014 +0100

all deps for tools are expected to be at one place

Change-Id: Ie0d359f6607811cd76aefe4e19d0fb05379f1762

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6360652a..06088c8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3768,6 +3768,7 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\
$(call gb_Rdb_get_target_for_build,ure/services) \
$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(call gb_UnoApi_get_target,udkapi) \
+   $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno)
 )
 endef
 
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index 4c0b9aa..16f331b 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -13,8 +13,7 @@ gb_CliUnoApi_EXT := $(gb_CliAssembly_POLICYEXT)
 
 gb_CliUnoApi_KEYFILE_DEFAULT := $(gb_CliAssembly_KEYFILE_DEFAULT)
 
-gb_CliUnoApi_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker) \
-$(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno)
+gb_CliUnoApi_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker)
 gb_CliUnoApi_COMMAND := $(call gb_Executable_get_command,climaker)
 
 define gb_CliUnoApi__command
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[David Tardon]

 RepositoryExternal.mk   |   10 +-
 solenv/gbuild/ExternalExecutable.mk |   14 +-
 solenv/gbuild/TargetLocations.mk|1 +
 3 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit dbac8f5a075a8e39068d5e21ab63de224f818eca
Author: David Tardon dtar...@redhat.com
Date:   Fri Apr 18 18:34:40 2014 +0200

restore deps on bins from bundled projects used during build

Change-Id: Ibd97268e4aaa61ec896135bf780173a18536101d

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 878d4b7..f11407e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3467,7 +3467,7 @@ gb_ExternalExecutable__register_xmllint :=
 else # ! SYSTEM_LIBXML_FOR_BUILD
 
 define gb_ExternalExecutable__register_xmllint
-$(call 
gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if
 $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build))
+$(call 
gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),xml2)
 $(call gb_ExternalExecutable_add_dependencies,xmllint,$(call 
gb_Package_get_target,xml2))
 
 endef
@@ -3481,7 +3481,7 @@ gb_ExternalExecutable__register_xsltproc :=
 else # ! SYSTEM_LIBXSLT_FOR_BUILD
 
 define gb_ExternalExecutable__register_xsltproc
-$(call 
gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build))
+$(call 
gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),xslt)
 $(call gb_ExternalExecutable_add_dependencies,xsltproc,$(call 
gb_Package_get_target,xslt))
 
 endef
@@ -3543,7 +3543,7 @@ endef
 else # ! SYSTEM_GENBRK
 
 define gb_ExternalExecutable__register_genbrk
-$(call 
gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build))
+$(call 
gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build),icu)
 $(call gb_ExternalExecutable_set_precommand,genbrk,$(subst 
$$,,$(gb_ICU_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,genbrk,\
$(call gb_Package_get_target_for_build,icu) \
@@ -3563,7 +3563,7 @@ endef
 else # ! SYSTEM_GENCCODE
 
 define gb_ExternalExecutable__register_genccode
-$(call 
gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build))
+$(call 
gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build),icu)
 $(call gb_ExternalExecutable_set_precommand,genccode,$(subst 
$$,,$(gb_ICU_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,genccode,\
$(call gb_Package_get_target_for_build,icu) \
@@ -3583,7 +3583,7 @@ endef
 else # ! SYSTEM_GENCMN
 
 define gb_ExternalExecutable__register_gencmn
-$(call 
gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build))
+$(call 
gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build),icu)
 $(call gb_ExternalExecutable_set_precommand,gencmn,$(subst 
$$,,$(gb_ICU_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,gencmn,\
$(call gb_Package_get_target_for_build,icu) \
diff --git a/solenv/gbuild/ExternalExecutable.mk 
b/solenv/gbuild/ExternalExecutable.mk
index 014e011..c1b3503 100644
--- a/solenv/gbuild/ExternalExecutable.mk
+++ b/solenv/gbuild/ExternalExecutable.mk
@@ -111,10 +111,11 @@ 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
-# FIXME hack to avoid dependency into workdir - those must be added explicitly
 define gb_ExternalExecutable__set_internal
+$(if $(3),,$(if $(filter $(WORKDIR_FOR_BUILD)/UnpackedTarball,$(2)),\
+   $(call gb_Output_error,depending directly on executable $(2) from 
UnpackedTarball is not allowed. Use the UnpackedTarball target as dependency.)))
 gb_ExternalExecutable_$(1)_EXECUTABLE := $(2)
-gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(findstring 
$(WORKDIR_FOR_BUILD),$(2)),,$(2))
+gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(3),$(3),$(2))
 gb_ExternalExecutable_$(1)_PRECOMMAND := $(subst 
$$,,$(gb_Helper_set_ld_path)) $(BUILDTOOLTRACE)
 
 endef
@@ -123,11 +124,14 @@ endef
 #
 # Optionally set a specific executable target to use (if the target
 # $(gb_Executable_BINDIR_FOR_BUILD)/$(1)$(gb_Executable_EXT_for_build) is
-# not suitable).
+# not suitable). Also optionally, set the ExternalProject that builds
+# the executable. This 

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[Riccardo Magliocchetti]

 RepositoryExternal.mk|4 ++--
 solenv/gbuild/Gallery.mk |4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b75fae74f7023d3cb78c6d1ecbcf019e020c3f56
Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date:   Thu Jun 6 18:52:57 2013 +0200

Don't require vclplug_svp with --enable-headless

Fixes build.

Change-Id: I4280cc26acd2278003f3bdee641a3168b01e17cb

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4fcdf4b..dd48feb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2971,9 +2971,9 @@ $(call gb_Executable_add_runtime_dependencies,$(1),\
$(call gb_Configuration_get_target,registry) \
$(call gb_Configuration_get_target,fcfg_langpack) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
-   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)), \
+   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, 
\
$(call gb_Library_get_target,vclplug_svp) \
-   ) \
+   )) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
$(call gb_UnoApi_get_target,offapi) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 0273b50..5ce7a6b 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -59,7 +59,9 @@ $(call gb_Output_announce,$(2),$(true),GAL,1)
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/*  \
$(call gb_Helper_print_on_error,\
-   $(if $(filter-out MACOSX 
WNT,$(OS_FOR_BUILD)),SAL_USE_VCLPLUGIN=svp) \
+   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if 
$(ENABLE_HEADLESS),, \
+   SAL_USE_VCLPLUGIN=svp \
+   )) \
$(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
$(call gb_Gallery__make_env_args) \
--build-tree \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

[David Tardon]

 RepositoryExternal.mk  |2 +-
 solenv/gbuild/Gallery.mk   |2 +-
 solenv/gbuild/extensions/pre_BuildTools.mk |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a494a8329f211a37ff2d5b8fe28bbc8a0a3beb66
Author: David Tardon dtar...@redhat.com
Date:   Thu May 16 14:38:39 2013 +0200

use $(OS_FOR_BUILD) to fix mingw cross-compilation

Change-Id: I606e99e80ace5b086210e5a724a3e979e2b98cbf

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d80a22a..2762e4c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2898,7 +2898,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal.bin,\
$(call gb_Configuration_get_target,registry) \
$(call gb_Configuration_get_target,fcfg_langpack) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
-   $(if $(filter-out MACOSX WNT,$(OS)), \
+   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)), \
$(call gb_Library_get_target,vclplug_svp) \
) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index a866a11..bf7d72c 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -59,7 +59,7 @@ $(call gb_Output_announce,$(2),$(true),GAL,1)
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/*  \
$(call gb_Helper_print_on_error,\
-   $(if $(filter-out MACOSX WNT,$(OS)),SAL_USE_VCLPLUGIN=svp) \
+   $(if $(filter-out MACOSX 
WNT,$(OS_FOR_BUILD)),SAL_USE_VCLPLUGIN=svp) \
$(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
$(call gb_Gallery__make_env_args) \
--build-tree \
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk 
b/solenv/gbuild/extensions/pre_BuildTools.mk
index 39dd1f5..b48f2c4 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -8,7 +8,7 @@
 #
 
 
-ifeq (,$(filter WNT,$(OS)))
+ifeq (,$(filter WNT,$(OS_FOR_BUILD)))
gb_GENGAL = gengal.bin
 else # windows appends the .exe
gb_GENGAL = gengal
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits