diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-26 14:11:18 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-26 14:22:20 -0400 |
| commit | 3326a85ae6ad417b37deeee52fd9a806f42004ba (patch) | |
| tree | acfa52f0a147114f86923741cb2f401aab2e3aad | |
| parent | make module-deps.pl work in separate builddir (diff) | |
| download | core-3326a85ae6ad417b37deeee52fd9a806f42004ba.tar.gz core-3326a85ae6ad417b37deeee52fd9a806f42004ba.zip | |
fix postgresql build
Change-Id: I379029dbf600769e415582aa7162f320e707c3da
| -rwxr-xr-x | bin/module-deps.pl | 1 | ||||
| -rw-r--r-- | connectivity/Library_postgresql-sdbc-impl.mk | 2 | ||||
| -rw-r--r-- | postgresql/ExternalPackage_postgresql.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 10 |
4 files changed, 7 insertions, 9 deletions
diff --git a/bin/module-deps.pl b/bin/module-deps.pl index 7f39b589b26c..de8022ca3f6f 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 d733f01662ea..00832dd3e935 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 ace19d048e79..bc5aee1a385f 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 61bdec4a0df6..52d268441892 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))) |