[Libreoffice-commits] .: 4 commits - redland/ExternalPackage_raptor.mk redland/ExternalPackage_rasqal.mk Repository.mk solenv/gbuild

[Libreoffice Gerrit user]

 Repository.mk                        |    2 +-
 redland/ExternalPackage_raptor.mk    |    2 ++
 redland/ExternalPackage_rasqal.mk    |    2 ++
 solenv/gbuild/AllLangResTarget.mk    |    4 ++--
 solenv/gbuild/Helper.mk              |    2 +-
 solenv/gbuild/InstallModuleTarget.mk |    2 +-
 solenv/gbuild/SdiTarget.mk           |    2 +-
 7 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 877113907606df20d465eee9b698c86d2299de18
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Dec 31 12:54:14 2012 +0200

    Add b_Helper_set_ld_path back in more places
    
    Change-Id: I05d1fc218fad0987958600a2638953672281919e

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 9e348e7..c85b612 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -48,7 +48,7 @@
 # SrsPartMergeTarget class
 
 gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependencies,transex3)
-gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(call gb_Executable_get_command,transex3)
+gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,transex3)
 
 define gb_SrsPartMergeTarget__command
 $(call gb_Output_announce,$(3),$(true),srs,1)
@@ -87,7 +87,7 @@ endef
 #  gb_SrsPartTarget__command_dep
 
 gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc)
-gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,rsc)
+gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,rsc)
 
 define gb_SrsPartTarget__command
 $(call gb_Helper_abbreviate_dirs,\
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index fca80c1..4584e19 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -156,7 +156,7 @@ endef
 #  gb_ScpConvertTarget_ScpConvertTarget_platform
 
 gb_ScpConvertTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfconv)
-gb_ScpConvertTarget_COMMAND := $(call gb_Executable_get_command,ulfconv)
+gb_ScpConvertTarget_COMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,ulfconv)
 
 define gb_ScpConvertTarget__command
 $(call gb_Output_announce,$(2),$(true),SCC,1)
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index 6ecc79d..0ccfc56 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -32,7 +32,7 @@
 
 # SdiTarget class
 gb_SdiTarget_SVIDLDEPS := $(call gb_Executable_get_runtime_dependencies,svidl)
-gb_SdiTarget_SVIDLCOMMAND := $(call gb_Executable_get_command,svidl)
+gb_SdiTarget_SVIDLCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,svidl)
 
 $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS)
 	$(call gb_Output_announce,$*,$(true),SDI,1)
commit fe20c74c3ff788e63174b4436357adaf3c965a52
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Dec 31 12:53:33 2012 +0200

    Deliver raptor.h and rasqal.h
    
    Change-Id: Ia9aae74702d562516825735642a4d707f845cbb9

diff --git a/redland/ExternalPackage_raptor.mk b/redland/ExternalPackage_raptor.mk
index 18e8fd4..1b5df27 100644
--- a/redland/ExternalPackage_raptor.mk
+++ b/redland/ExternalPackage_raptor.mk
@@ -26,4 +26,6 @@ $(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor-lo.so.1,src/.libs
 $(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor.so,src/.libs/libraptor-lo.so.1.1.0))
 endif
 
+$(eval $(call gb_ExternalPackage_add_file,raptor,inc/external/raptor.h,src/raptor.h))
+
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalPackage_rasqal.mk b/redland/ExternalPackage_rasqal.mk
index 41576ae..ddb4e5b 100644
--- a/redland/ExternalPackage_rasqal.mk
+++ b/redland/ExternalPackage_rasqal.mk
@@ -26,4 +26,6 @@ $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.so.1,src/.libs
 $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.so,src/.libs/librasqal-lo.so.1.0.0))
 endif
 
+$(eval $(call gb_ExternalPackage_add_file,rasqal,inc/external/rasqal.h,src/rasqal.h))
+
 # vim: set noet sw=4 ts=4:
commit 341b467102d7b7d04752570611255332a4dc2692
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Dec 31 12:16:09 2012 +0200

    We need b_Helper_set_ld_path here I think
    
    Change-Id: Ie6dc76859ff51e1d25abbf65de1abfba46dd4252

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index c7ffdc6..898ac44 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -206,7 +206,7 @@ $(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def)))
 endef
 
 define gb_Helper_execute
-$(call gb_Executable_get_command,$(1))
+$(gb_Helper_set_ld_path) $(call gb_Executable_get_command,$(1))
 endef
 
 # gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use
commit d6c090c1c7fb3749716c18be4ec8adcacfeffad9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Dec 31 12:09:44 2012 +0200

    Revert "bestreversemap uses URE (libuno_sal)"
    
    Sure, but this was wrong.
    
    This reverts commit e795b4d80dec9eb1e9b63daa4e31c03d8d68f220.

diff --git a/Repository.mk b/Repository.mk
index 2cd858d..b712bd2 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     HelpIndexer \
     HelpLinker \
     adjustvisibility \
+    bestreversemap \
     bmp \
     bmpsum \
     cfgex \
@@ -174,7 +175,6 @@ endif
 ifneq ($(OS),IOS)
 
 $(eval $(call gb_Helper_register_executables,UREBIN,\
-	bestreversemap \
 	regmerge \
 	regview \
 	uno \