[Libreoffice-commits] .: 3 commits - connectivity/Library_postgresql-sdbc-impl.mk RepositoryExternal.mk solenv/gbuild

[Libreoffice Gerrit user]

 RepositoryExternal.mk                        |    4 ++++
 connectivity/Library_postgresql-sdbc-impl.mk |    4 ----
 solenv/gbuild/ExternalPackage.mk             |    3 +++
 solenv/gbuild/Library.mk                     |    2 --
 solenv/gbuild/LinkTarget.mk                  |   11 -----------
 5 files changed, 7 insertions(+), 17 deletions(-)

New commits:
commit 9588085b0062c25c0e6e370f5d496727f18a13a9
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 22 07:02:54 2012 +0200

    add note to ExternalPackage doc
    
    Change-Id: I920e0f6cea18c825dc5786b6b4f2df1c0ddb890d

diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index f24a2ca..c69d3ad 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -18,6 +18,9 @@
 # previous version, so the delivered headers will not be updated.
 #
 # Uff, I hope this is at least partially understandable :-)
+#
+# Note: An ExternalPackage object can be used in functions that expect a
+# Package (e.g., gb_LinkTarget_use_package(s)).
 
 $(dir $(call gb_ExternalPackage_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
commit 1149fa1d180d372cc660270ad1926fcae4043463
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 22 06:52:33 2012 +0200

    drop unneeded functions
    
    ExternalPackage has intentionally been made compatible with Package, so
    it can be passed to gb_LinkTarget_use_package(s).
    
    Change-Id: I11cd55e1f570ddab7315a7229321fc3392fd49f4

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index a3c3f52..d07fe24 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -210,8 +210,6 @@ $(eval $(foreach method,\
 	add_external_headers \
 	use_package \
 	use_packages \
-	use_external_package \
-	use_external_packages \
 	use_unpacked \
 	add_package_headers \
 	add_sdi_headers \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index efe6a3a..870bad1 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1139,17 +1139,6 @@ define gb_LinkTarget_use_packages
 $(foreach package,$(2),$(call gb_LinkTarget_use_package,$(1),$(package)))
 endef
 
-# use a external package, possibly from another module (i.e. via OUTDIR)
-define gb_LinkTarget_use_external_package
-$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
-	$(call gb_ExternalPackage_get_target,$(strip $(2)))
-
-endef
-
-define gb_LinkTarget_use_external_packages
-$(foreach package,$(2),$(call gb_LinkTarget_use_external_package,$(1),$(package)))
-endef
-
 # Use sources from unpacked tarball of an external project
 define gb_LinkTarget_use_unpacked
 $(call gb_LinkTarget_get_external_headers_target,$(1)) :| $(call gb_UnpackedTarball_get_final_target,$(2))
commit cb9823b6113eb2c7cc44c1b6659a808fe0bdef25
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 22 06:33:00 2012 +0200

    make sure libpq is in place before it is used
    
    Change-Id: I799a149b319bb6a3168117810084496f8b6d6fbb

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8c8e449..4260150 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1772,6 +1772,10 @@ else # !SYSTEM_POSTGRESQL
 
 define gb_LinkTarget__use_postgresql
 
+$(call gb_LinkTarget_use_packages,$(1),\
+	postgresql \
+)
+
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(OUTDIR)/inc/postgresql \
 	$$(INCLUDE) \
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index b5094cb..8fbb372 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -64,10 +64,6 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
 ifneq ($(SYSTEM_POSTGRESQL),YES)
 ifneq ($(GUI)$(COM),WNTMSC)
 
-$(eval $(call gb_Library_use_external_package,postgresql-sdbc-impl,\
-	postgresql \
-))
-
 -include $(OUTDIR)/inc/postgresql/libpq-flags.mk
 
 $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\