bin/module-deps.pl | 7 +++++--
connectivity/Library_postgresql-sdbc-impl.mk | 2 +-
postgresql/ExternalPackage_postgresql.mk | 3 ---
solenv/gbuild/LinkTarget.mk | 10 +++++-----
4 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 3326a85ae6ad417b37deeee52fd9a806f42004ba
Author: Peter Foley <pefol...@verizon.net>
Date: Tue Mar 26 14:11:18 2013 -0400
fix postgresql build
Change-Id: I379029dbf600769e415582aa7162f320e707c3da
diff --git a/bin/module-deps.pl b/bin/module-deps.pl
index 7f39b58..de8022c 100755
--- a/bin/module-deps.pl
+++ b/bin/module-deps.pl
@@ -163,6 +163,7 @@ sub prune_redundant_deps($)
sub create_lib_module_map()
{
my %l2m;
+ $l2m{'merged'} = 'merged';
for (glob($src_root."/*/Library_*.mk"))
{
/.*\/(.*)\/Library_(.*)\.mk/;
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk
b/connectivity/Library_postgresql-sdbc-impl.mk
index d733f01..00832dd 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -61,7 +61,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
boost_headers \
postgresql \
openssl \
- openldap \
+ $(if $(SYSTEM_OPENLDAP),openldap) \
nss3 \
plc4 \
ssl3 \
diff --git a/postgresql/ExternalPackage_postgresql.mk
b/postgresql/ExternalPackage_postgresql.mk
index ace19d0..bc5aee1 100644
--- a/postgresql/ExternalPackage_postgresql.mk
+++ b/postgresql/ExternalPackage_postgresql.mk
@@ -24,8 +24,5 @@ else
$(eval $(call gb_ExternalPackage_add_files,postgresql,lib,\
src/interfaces/libpq/libpq.a \
))
-$(eval $(call gb_ExternalPackage_add_files,postgresql,inc/postgresql,\
- src/interfaces/libpq/libpq-flags.mk \
-))
endif
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 61bdec4..52d2684 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -826,15 +826,15 @@ $$(eval $$(call gb_Output_info,currently known libraries
are: $(sort $(gb_Librar
$$(eval $$(call gb_Output_error,Cannot link against library/libraries
$$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in
Repository.mk))
endif
-# used by bin/module-deps.pl
-ifneq ($(ENABLE_PRINT_DEPS),)
-$$(eval $$(call gb_PrintDeps_info,$(1),$(2),$(3),$(4)))
-endif
-
gb_LINKED_LIBS := $(if $(filter $(gb_MERGEDLIBS),$(2)), \
$(if $(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call
gb_Library_get_linktargetname,$(lib)))),, merged)) \
$(filter-out $(gb_MERGEDLIBS),$(2))
+# used by bin/module-deps.pl
+ifneq ($(ENABLE_PRINT_DEPS),)
+$$(eval $$(call gb_PrintDeps_info,$(1),$$(gb_LINKED_LIBS),$(3),$(4)))
+endif
+
$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $$(gb_LINKED_LIBS)
$(call gb_LinkTarget_get_target,$(1)) : $$(foreach
lib,$$(gb_LINKED_LIBS),$$(call gb_Library_get_target,$$(lib)))
commit ca9435ecbbf27e1d49a89956c80b527ae5c3efd1
Author: Peter Foley <pefol...@verizon.net>
Date: Tue Mar 26 12:47:06 2013 -0400
make module-deps.pl work in separate builddir
Change-Id: I951e5b760fa4749cb712a927110e702949e0eaa3
diff --git a/bin/module-deps.pl b/bin/module-deps.pl
index a46634a..7f39b58 100755
--- a/bin/module-deps.pl
+++ b/bin/module-deps.pl
@@ -6,6 +6,7 @@ use Getopt::Long qw(GetOptions VersionMessage);
use Pod::Usage;
my $gnumake;
+my $src_root;
my $makefile_build;
my $verbose = 0;
my $from_file;
@@ -162,9 +163,9 @@ sub prune_redundant_deps($)
sub create_lib_module_map()
{
my %l2m;
- for (glob("*/Library_*.mk"))
+ for (glob($src_root."/*/Library_*.mk"))
{
- /(.*)\/Library_(.*)\.mk/;
+ /.*\/(.*)\/Library_(.*)\.mk/;
# add module -> module
$l2m{$1} = $1;
# add lib -> module
@@ -303,6 +304,7 @@ sub parse_options()
($gnumake, $makefile_build) = @ARGV if $#ARGV == 1;
$gnumake = 'make' if (!defined $gnumake);
$makefile_build = 'Makefile.gbuild' if (!defined $makefile_build);
+ $src_root = defined $ENV{SRC_ROOT} ? $ENV{SRC_ROOT} : ".";
}
sub main()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
